Add conflicts and provides declarations

This eases the upgrade from selinux- and selinux-usr- packages to new package names

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd4d3adb17ab..431b883d2341 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,9 @@ pkgbase = pam-selinux
 	depends = pambase
 	depends = libselinux
 	provides = pam=1.1.8-2
+	provides = selinux-pam=1.1.8-2
 	conflicts = pam
+	conflicts = selinux-pam
 	options = !emptydirs
 	backup = etc/security/access.conf
 	backup = etc/security/group.conf
diff --git a/PKGBUILD b/PKGBUILD
index 263b7e28bcda..b5558ead6dd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ license=('GPL2')
 url="http://www.kernel.org/pub/linux/libs/pam/"
 depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase' 'libselinux')
 makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-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/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf}
         etc/default/passwd
 	etc/environment)