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 445f59b8527c..b4aefa533865 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,9 @@ pkgbase = openssh-selinux
 	optdepends = xorg-xauth: X11 forwarding
 	optdepends = x11-ssh-askpass: input passphrase in X
 	provides = openssh=6.3p1-1
+	provides = selinux-openssh=6.3p1-1
 	conflicts = openssh
+	conflicts = selinux-openssh
 	backup = etc/ssh/ssh_config
 	backup = etc/ssh/sshd_config
 	backup = etc/pam.d/sshd
diff --git a/PKGBUILD b/PKGBUILD
index 7eec0e13fded..8e8352aa7da8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ makedepends=('linux-selinux-headers')
 depends=('krb5' 'openssl' 'libedit' 'ldns' 'libselinux')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
-conflicts=("${pkgname/-selinux}")
-provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}")
+conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
+provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
 groups=('selinux')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz"
         'sshdgenkeys.service'