summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2013-12-20 22:34:30 +0100
committerTimothée Ravier2014-01-02 21:54:50 +0100
commit49e3361b3eb11f955b1973eb5e7bb6490b097342 (patch)
tree741fe3a0c643f0b81ef714e3148985c3d253a4ec
parentce7cb98c730b2e8292f01e45a3f94785812834b5 (diff)
downloadaur-49e3361b3eb11f955b1973eb5e7bb6490b097342.tar.gz
Add conflicts and provides declarations
This eases the upgrade from selinux- and selinux-usr- packages to new package names
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2839ddee89fa..883750cb2d7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,9 +19,11 @@ pkgbase = util-linux-selinux
provides = util-linux-ng=2.24
provides = eject
provides = util-linux=2.24-
+ provides = selinux-util-linux=2.24-
conflicts = util-linux-ng
conflicts = eject
conflicts = util-linux
+ conflicts = selinux-util-linux
options = strip
options = debug
backup = etc/pam.d/chfn
diff --git a/PKGBUILD b/PKGBUILD
index a0afc20c0d28..766ff67142d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ depends=('pam-selinux' 'shadow-selinux' 'coreutils' 'glibc' 'libselinux')
optdepends=('python: python bindings to libmount')
makedepends=('systemd' 'python')
# checkdepends=('bc')
-conflicts=('util-linux-ng' 'eject' "${pkgname/-selinux}")
-provides=("util-linux-ng=$pkgver" 'eject' "${pkgname/-selinux}=${pkgver}-${pkrel}")
+conflicts=('util-linux-ng' 'eject' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
+provides=("util-linux-ng=$pkgver" 'eject' "${pkgname/-selinux}=${pkgver}-${pkrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkrel}")
license=('GPL2')
options=('strip' 'debug')
source=("ftp://ftp.kernel.org/pub/linux/utils/${pkgname/-selinux}/v2.24/${pkgname/-selinux}-$pkgver.tar.xz"