summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2013-12-20 22:34:30 +0100
committerTimothée Ravier2014-01-02 21:54:50 +0100
commit3dfae23bd8c5fc7b74473a43331b1c3927ad8271 (patch)
treec07e36745b824228d0d6997df4655f3ac3263028
parent9acabedc3fc747958da16a85d423fa040e01221c (diff)
downloadaur-3dfae23bd8c5fc7b74473a43331b1c3927ad8271.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 6da1880d81a6..029f09e83d3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,9 @@ pkgbase = shadow-selinux
depends = acl
depends = libselinux
provides = shadow=4.1.5.1-7
+ provides = selinux-shadow=4.1.5.1-7
conflicts = shadow
+ conflicts = selinux-shadow
options = strip
options = debug
backup = etc/login.defs
diff --git a/PKGBUILD b/PKGBUILD
index e22e4f734ab7..b8274fc1713b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ url='http://pkg-shadow.alioth.debian.org/'
license=('BSD')
groups=('selinux')
depends=('bash' 'pam-selinux' 'acl' 'libselinux')
-conflicts=("${pkgname/-selinux}")
-provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}")
+conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
+provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
backup=(etc/login.defs
etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel}
etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}