summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2013-12-20 22:34:30 +0100
committerTimothée Ravier2014-01-02 21:54:50 +0100
commit3ec0484af70fe5e34e90f0158e6d135feff5ba07 (patch)
treeed9388e71f93247e1e519d56955fc4581d86a2fb
parent937dcd7aa1aa999d9691d962d1e04a18528f4a33 (diff)
downloadaur-3ec0484af70fe5e34e90f0158e6d135feff5ba07.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 b11ba183dd0c..d8df70a69dcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,9 @@ pkgbase = pambase-selinux
groups = selinux
license = GPL
provides = pambase=20130928-1
+ provides = selinux-pambase=20130928-1
conflicts = pambase
+ conflicts = selinux-pambase
backup = etc/pam.d/system-auth
backup = etc/pam.d/system-local-login
backup = etc/pam.d/system-login
diff --git a/PKGBUILD b/PKGBUILD
index ba9ac09aea88..bf5441436b51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@ arch=('any')
url="http://www.archlinux.org"
license=('GPL')
groups=('selinux')
-conflicts=("${pkgname/-selinux}")
-provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}")
+conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
+provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
source=('system-auth'
'system-local-login'
'system-login'