aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSertonix <sertonix@posteo.net>2023-12-18 11:58:43 +0100
committerptrcnull <git@ptrcnull.me>2024-02-18 22:24:31 +0100
commitb5b069d8c13341591d5072c2516190da23d410dc (patch)
tree20d34e6a29942d7ae9311ffd8428d2d4c4f1adbd
parent180cbe00c652c9afce8c3ca9b74823f18245d614 (diff)
*/*: specify version in install_if when possible
Subpackages that install_if on the main package or another subpackage under the same main package can specify a version in their install_if condition. Then subpackages won't be left installed on systems when the subpackage is removed.
-rw-r--r--community/discover/APKBUILD8
-rw-r--r--community/dotnet6-build/APKBUILD6
-rw-r--r--community/dotnet7-build/APKBUILD6
-rw-r--r--community/emacspeak/APKBUILD4
-rw-r--r--community/kodi/APKBUILD4
-rw-r--r--community/minetest/APKBUILD4
-rw-r--r--community/phodav/APKBUILD4
-rw-r--r--community/spdx-licenses/APKBUILD4
-rw-r--r--main/ifupdown-ng/APKBUILD16
-rw-r--r--main/lvm2/APKBUILD4
-rw-r--r--main/ndisc6/APKBUILD4
-rw-r--r--testing/autorandr/APKBUILD2
12 files changed, 33 insertions, 33 deletions
diff --git a/community/discover/APKBUILD b/community/discover/APKBUILD
index c04ec516637..c0699d16077 100644
--- a/community/discover/APKBUILD
+++ b/community/discover/APKBUILD
@@ -5,7 +5,7 @@
# group=kde-plasma
pkgname=discover
pkgver=5.27.10.1
-pkgrel=0
+pkgrel=1
pkgdesc="KDE Plasma resources management GUI"
url="https://userbase.kde.org/Discover"
# armhf blocked by qt5-qtdeclarative
@@ -97,7 +97,7 @@ package() {
backend_flatpak() {
pkgdesc="Flatpak backend for $pkgname"
depends=""
- install_if="$pkgname flatpak"
+ install_if="$pkgname=$pkgver-r$pkgrel flatpak"
amove usr/lib/qt5/plugins/discover/flatpak-backend.so
amove usr/share/libdiscover/categories/flatpak-backend-categories.xml
@@ -110,7 +110,7 @@ backend_flatpak() {
backend_apk() {
pkgdesc="Apk backend for $pkgname"
depends=""
- install_if="$pkgname apk-tools"
+ install_if="$pkgname=$pkgver-r$pkgrel apk-tools"
amove usr/lib/qt5/plugins/discover/alpineapk-backend.so
amove usr/lib/libexec/kauth/alpineapk_kauth_helper
@@ -130,7 +130,7 @@ backend_apk() {
backend_fwupd() {
pkgdesc="fwupd backend for $pkgname"
depends=""
- install_if="$pkgname fwupd"
+ install_if="$pkgname=$pkgver-r$pkgrel fwupd"
amove usr/lib/qt5/plugins/discover/fwupd-backend.so
}
diff --git a/community/dotnet6-build/APKBUILD b/community/dotnet6-build/APKBUILD
index 436f81b9943..2206fd88b80 100644
--- a/community/dotnet6-build/APKBUILD
+++ b/community/dotnet6-build/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=dotnet6-build
pkgver=6.0.127
-pkgrel=0
+pkgrel=1
# remember to upgrade dotnet6-runtime $_bldver when upgrading dotnet6-build
_gittag=v$pkgver
_giturl="https://github.com/dotnet/installer"
@@ -532,7 +532,7 @@ zshcomp() {
pkgdesc="zsh completion for .NET"
# netstandard21-targeting-pack will always be pulled by any dotnetx-sdk
# thus pulling this with it for sdk
- install_if="netstandard21-targeting-pack zsh"
+ install_if="netstandard21-targeting-pack=$pkgver-r$pkgrel zsh"
depends="dotnet-host"
install -dm 755 "$subpkgdir"/usr/share/zsh/site-functions
@@ -544,7 +544,7 @@ bashcomp() {
pkgdesc="bash completion for .NET"
# netstandard21-targeting-pack will always be pulled by any dotnetx-sdk
# thus pulling this with it for sdk
- install_if="netstandard21-targeting-pack bash-completion"
+ install_if="netstandard21-targeting-pack=$pkgver-r$pkgrel bash-completion"
depends="dotnet-host"
install -dm 755 "$subpkgdir"/usr/share/bash-completion/completions
diff --git a/community/dotnet7-build/APKBUILD b/community/dotnet7-build/APKBUILD
index f7ccddb5828..bcf358a4233 100644
--- a/community/dotnet7-build/APKBUILD
+++ b/community/dotnet7-build/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=dotnet7-build
pkgver=7.0.116
-pkgrel=0
+pkgrel=1
# remember to upgrade dotnet7-runtime $_bldver as well
_gittag=v$pkgver
_giturl="https://github.com/dotnet/installer"
@@ -528,7 +528,7 @@ zshcomp() {
pkgdesc="zsh completion for .NET"
# netstandard21-targeting-pack will always be pulled by any dotnetx-sdk
# thus pulling this with it for sdk
- install_if="netstandard21-targeting-pack zsh"
+ install_if="netstandard21-targeting-pack=$pkgver-r$pkgrel zsh"
depends="dotnet-host"
install -dm 755 "$subpkgdir"/usr/share/zsh/site-functions
@@ -540,7 +540,7 @@ bashcomp() {
pkgdesc="bash completion for .NET"
# netstandard21-targeting-pack will always be pulled by any dotnetx-sdk
# thus pulling this with it for sdk
- install_if="netstandard21-targeting-pack bash-completion"
+ install_if="netstandard21-targeting-pack=$pkgver-r$pkgrel bash-completion"
depends="dotnet-host"
install -dm 755 "$subpkgdir"/usr/share/bash-completion/completions
diff --git a/community/emacspeak/APKBUILD b/community/emacspeak/APKBUILD
index b00c7fa7847..6682ceaf5f2 100644
--- a/community/emacspeak/APKBUILD
+++ b/community/emacspeak/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Celeste <cielesti@protonmail.com>
pkgname=emacspeak
pkgver=59.0
-pkgrel=0
+pkgrel=1
pkgdesc="Emacs audio desktop for eyes-free computing"
url="https://emacspeak.sourceforge.net/"
arch="all"
@@ -99,7 +99,7 @@ package() {
ems_espeak() {
pkgdesc="$pkgdesc (espeak-ng speech server)"
depends="tclx"
- install_if="emacspeak espeak-ng"
+ install_if="emacspeak=$pkgver-r$pkgrel espeak-ng"
local servdir="$_emsdir"/servers
# move supported speech servers
diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD
index 7507f26a2af..eb6bcd75aaa 100644
--- a/community/kodi/APKBUILD
+++ b/community/kodi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=kodi
pkgver=20.2
_realname=Nexus
-pkgrel=3
+pkgrel=4
_libdvdcss="1.4.3-Next-Nexus-Alpha2-2"
_libdvdnav="6.1.1-Next-Nexus-Alpha2-2"
_libdvdread="6.1.3-Next-Nexus-Alpha2-2"
@@ -272,7 +272,7 @@ py3() {
polkit() {
pkgdesc="Polkit rules for Kodi in combination with GBM"
- install_if="$pkgname-gbm polkit"
+ install_if="$pkgname-gbm=$pkgver-r$pkgrel polkit"
amove usr/share/polkit-1/rules.d
}
diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD
index 26afbaeb154..5c1673e3b49 100644
--- a/community/minetest/APKBUILD
+++ b/community/minetest/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=minetest
pkgver=5.8.0
-pkgrel=0
+pkgrel=1
pkgdesc="An infinite-world block sandbox game and a game engine"
url="https://www.minetest.net/"
# ppc64le, riscv64 blocked by luajit
@@ -107,7 +107,7 @@ server() {
openrc() {
pkgdesc="Minetest server (OpenRC init scripts)"
- install_if="$pkgname-server openrc"
+ install_if="$pkgname-server=$pkgver-r$pkgrel openrc"
install -Dm755 "$srcdir"/minetest-server.initd \
"$subpkgdir"/etc/init.d/minetest-server
diff --git a/community/phodav/APKBUILD b/community/phodav/APKBUILD
index c7c5902de90..adf1c072c0c 100644
--- a/community/phodav/APKBUILD
+++ b/community/phodav/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=phodav
pkgver=3.0
-pkgrel=2
+pkgrel=3
pkgdesc="WebDAV server using libsoup"
url="https://wiki.gnome.org/phodav"
arch="all"
@@ -59,7 +59,7 @@ spice() {
spice_openrc() {
pkgdesc="Spice daemon for the DAV channel (OpenRC init scripts)"
- install_if="spice-webdavd openrc"
+ install_if="spice-webdavd=$pkgver-r$pkgrel openrc"
mkdir -p "$subpkgdir"/etc/init.d
install "$srcdir"/spice-webdavd.initd "$subpkgdir"/etc/init.d/spice-webdavd
}
diff --git a/community/spdx-licenses/APKBUILD b/community/spdx-licenses/APKBUILD
index 9d356f4be2f..d4791fa79c7 100644
--- a/community/spdx-licenses/APKBUILD
+++ b/community/spdx-licenses/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=spdx-licenses
pkgver=3.22
-pkgrel=0
+pkgrel=1
pkgdesc="Various data formats for the SPDX License List"
url="https://spdx.org/"
arch="noarch"
@@ -25,7 +25,7 @@ package() {
_subpkg() {
local type=${subpkgname/$pkgname-/}
pkgdesc="$pkgdesc ($type)"
- install_if="$pkgname"
+ install_if="$pkgname=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir"/usr/share/spdx
cp -r "$builddir"/$type "$subpkgdir"/usr/share/spdx/
}
diff --git a/main/ifupdown-ng/APKBUILD b/main/ifupdown-ng/APKBUILD
index 6b603d393fc..219b10cda11 100644
--- a/main/ifupdown-ng/APKBUILD
+++ b/main/ifupdown-ng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=ifupdown-ng
pkgver=0.12.1
-pkgrel=4
+pkgrel=5
pkgdesc="tools for managing network configuration"
url="https://github.com/ifupdown-ng/ifupdown-ng"
arch="all"
@@ -59,7 +59,7 @@ package() {
iproute2() {
pkgdesc="ifupdown-ng integration for iproute2"
depends="iproute2-minimal"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
for exec in $_executor_iproute2; do
amove usr/libexec/ifupdown-ng/$exec
@@ -69,7 +69,7 @@ iproute2() {
ppp() {
pkgdesc="ifupdown-ng integration for ppp"
depends="ppp-daemon"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
amove usr/libexec/ifupdown-ng/ppp
}
@@ -77,7 +77,7 @@ ppp() {
wireguard() {
pkgdesc="ifupdown-ng integration for wireguard"
depends="wireguard-tools-wg"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
amove usr/libexec/ifupdown-ng/wireguard
}
@@ -85,7 +85,7 @@ wireguard() {
wgquick() {
pkgdesc="ifupdown-ng integration for wireguard wg-quick"
depends="wireguard-tools-wg-quick"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
amove usr/libexec/ifupdown-ng/wireguard-quick
}
@@ -93,7 +93,7 @@ wgquick() {
ethtool() {
pkgdesc="ifupdown-ng integration for ethtool"
depends="ethtool"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
amove usr/libexec/ifupdown-ng/ethtool
}
@@ -101,7 +101,7 @@ ethtool() {
batman() {
pkgdesc="ifupdown-ng integration for B.A.T.M.A.N. advanced"
depends="batctl"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
amove usr/libexec/ifupdown-ng/batman
}
@@ -109,7 +109,7 @@ batman() {
wifi() {
pkgdesc="ifupdown-ng integration for wifi"
depends="wpa_supplicant"
- install_if="$pkgname $depends"
+ install_if="$pkgname=$pkgver-r$pkgrel $depends"
amove usr/libexec/ifupdown-ng/wifi
}
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 43287ff0759..260e7a203ad 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lvm2
pkgver=2.03.23
-pkgrel=0
+pkgrel=1
pkgdesc="Logical Volume Manager 2 utilities"
url="https://sourceware.org/lvm2/"
arch="all"
@@ -125,7 +125,7 @@ dm() {
udev() {
pkgdesc="Device mapper udev rules"
install="$subpkgname.post-install $subpkgname.post-upgrade"
- install_if="device-mapper eudev"
+ install_if="device-mapper=$pkgver-r$pkgrel eudev"
amove usr/lib/udev/rules.d
}
diff --git a/main/ndisc6/APKBUILD b/main/ndisc6/APKBUILD
index 750e5a1c6fe..fc73005ab10 100644
--- a/main/ndisc6/APKBUILD
+++ b/main/ndisc6/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=ndisc6
pkgver=1.0.8
-pkgrel=0
+pkgrel=1
pkgdesc="a small collection of useful tools for IPv6 networking"
url="https://www.remlab.net/ndisc6"
arch="all"
@@ -38,7 +38,7 @@ package() {
dnssort() {
pkgdesc="ndisc6 dnssort (perl)"
- install_if="$pkgname perl"
+ install_if="$pkgname=$pkgver-r$pkgrel perl"
depends=perl
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/dnssort "$subpkgdir"/usr/bin/
diff --git a/testing/autorandr/APKBUILD b/testing/autorandr/APKBUILD
index b59ee0b6e4a..b01ff1e535f 100644
--- a/testing/autorandr/APKBUILD
+++ b/testing/autorandr/APKBUILD
@@ -37,7 +37,7 @@ package() {
}
udev() {
- install_if="$pkgname udev"
+ install_if="$pkgname=$pkgver-r$pkgrel udev"
amove etc/udev/rules.d/
}