From ffa0f7bc3d06264830ea6e4a7e50e04b22cbf55c Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Wed, 19 Apr 2023 18:57:31 +0100
Subject: [PATCH] build: drop lsb-release build deps.

---
 .gitlab-ci.yml                                  | 4 ++--
 PKGBUILD                                        | 2 +-
 debian/control                                  | 1 -
 dists/build.sh                                  | 2 +-
 docs/install.md                                 | 3 +--
 tests/packer/init/archlinux-gnome.user-data.yml | 1 -
 tests/packer/init/archlinux-kde.user-data.yml   | 1 -
 tests/packer/init/ubuntu-server.user-data.yml   | 1 -
 tests/packer/src/init.sh                        | 2 +-
 9 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e4b787e..8a56da5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ archlinux:
   stage: build
   image: registry.gitlab.com/roddhjav/builders/archlinux
   script:
-    - sudo pacman -Syu --noconfirm --noprogressbar lsb-release
+    - sudo pacman -Syu --noconfirm --noprogressbar
     - makepkg -s --noconfirm --noprogressbar
   artifacts:
     expire_in: 1 day
@@ -74,7 +74,7 @@ debian:
     - git config --global --add safe.directory $CI_PROJECT_DIR
     - VERSION="0.$(git rev-list --count HEAD)-1"
     - mkdir -p "$PKGDEST"
-    - sudo apt-get update -q && sudo apt-get install -y lsb-release config-package-dev rsync
+    - sudo apt-get update -q && sudo apt-get install -y config-package-dev rsync
     - sudo apt-get install -y -t bullseye-backports golang-go
     - dch --newversion=$VERSION --urgency=medium --distribution=stable --controlmaint "Release $VERSION"
     - dpkg-buildpackage -b -d --no-sign
diff --git a/PKGBUILD b/PKGBUILD
index 19459da9..328a5496 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ arch=("x86_64")
 url="https://github.com/roddhjav/$pkgname"
 license=('GPL2')
 depends=('apparmor')
-makedepends=('go' 'git' 'rsync' 'lsb-release')
+makedepends=('go' 'git' 'rsync')
 conflicts=("$pkgname-git")
 
 pkgver() {
diff --git a/debian/control b/debian/control
index 00ba770b..c640be32 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Alexandre Pujol <alexandre@pujol.io>
 Build-Depends: debhelper (>= 13.4),
                debhelper-compat (= 13),
                golang-any,
-               lsb-release,
                config-package-dev,
                rsync,
 Homepage: https://github.com/roddhjav/apparmor.d
diff --git a/dists/build.sh b/dists/build.sh
index 4a8f7ff2..cfa989fd 100644
--- a/dists/build.sh
+++ b/dists/build.sh
@@ -80,7 +80,7 @@ build_in_docker_dpkg() {
 			--env DEBIAN_FRONTEND=noninteractive --env DIST="$dist" \
 			"$BASEIMAGE/$dist"
 		docker exec "$img" sudo apt-get update -q
-        docker exec "$img" sudo apt-get install -y lsb-release config-package-dev rsync
+        docker exec "$img" sudo apt-get install -y config-package-dev rsync
 		[[ "$COMMAND" == debian ]] && aptopt=(-t bullseye-backports)
 		docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go
 	fi
diff --git a/docs/install.md b/docs/install.md
index 72b5b907..155f8211 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -25,8 +25,7 @@ Also, please note wayland has better support than xorg.
 
 **Build dependencies**
 
-* Go
-* lsb-release
+* Go >= 1.18
 * Rsync
 
 ## :material-arch: Archlinux
diff --git a/tests/packer/init/archlinux-gnome.user-data.yml b/tests/packer/init/archlinux-gnome.user-data.yml
index 05d78a10..96efe79f 100644
--- a/tests/packer/init/archlinux-gnome.user-data.yml
+++ b/tests/packer/init/archlinux-gnome.user-data.yml
@@ -28,7 +28,6 @@ packages:
   - bash-completion
   - git
   - htop
-  - lsb-release
   - man
   - pass
   - python-notify2
diff --git a/tests/packer/init/archlinux-kde.user-data.yml b/tests/packer/init/archlinux-kde.user-data.yml
index 3a163329..fcd9a6ee 100644
--- a/tests/packer/init/archlinux-kde.user-data.yml
+++ b/tests/packer/init/archlinux-kde.user-data.yml
@@ -28,7 +28,6 @@ packages:
   - bash-completion
   - git
   - htop
-  - lsb-release
   - man
   - pass
   - python-notify2
diff --git a/tests/packer/init/ubuntu-server.user-data.yml b/tests/packer/init/ubuntu-server.user-data.yml
index f1c92df2..992c4bed 100644
--- a/tests/packer/init/ubuntu-server.user-data.yml
+++ b/tests/packer/init/ubuntu-server.user-data.yml
@@ -23,7 +23,6 @@ packages:
   - devscripts
   - golang-go
   - htop
-  - lsb-release
   - qemu-guest-agent
   - rsync
   - vim
diff --git a/tests/packer/src/init.sh b/tests/packer/src/init.sh
index f9de2cd9..7cefce5c 100644
--- a/tests/packer/src/init.sh
+++ b/tests/packer/src/init.sh
@@ -21,7 +21,7 @@ main() {
 	chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/"
 	case "$DISTRIBUTION" in
 	debian | ubuntu)	dpkg -i $SRC/apparmor.d_*_all.deb ;;
-	opensuse*)			zypper install -y bash-completion git go htop lsb-release make rsync vim ;;
+	opensuse*)			zypper install -y bash-completion git go htop make rsync vim ;;
 	arch)				pacman --noconfirm -U $SRC/apparmor.d-*-x86_64.pkg.tar.zst ;;
 	esac
 }