summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2013-12-20 22:34:30 +0100
committerTimothée Ravier2014-01-02 21:54:50 +0100
commit6bcd4ec38b8658d8797a2f40deb8f22386532a4c (patch)
tree13f77c2216273a82743e4dd5fc01fd47c9cbaaf7
parent9d744d46157eb9a6a88e450541486cce4e62ee26 (diff)
downloadaur-6bcd4ec38b8658d8797a2f40deb8f22386532a4c.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 e50ced4aa995..52a1ff649000 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,9 @@ pkgbase = psmisc-selinux
license = GPL
depends = ncurses
provides = psmisc=22.20-1
+ provides = selinux-psmisc=22.20-1
conflicts = psmisc
+ conflicts = selinux-psmisc
source = http://downloads.sourceforge.net/psmisc/psmisc-22.20.tar.gz
source = psmisc-22.20-fix-selinux-in-pstree.patch
sha1sums = abdddc8d5c91251bba0f3190956ae9d05c058745
diff --git a/PKGBUILD b/PKGBUILD
index b68c30ac948a..ccc798ee0f8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ url="http://psmisc.sourceforge.net/index.html"
license=('GPL')
groups=('selinux')
depends=('ncurses')
-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=(http://downloads.sourceforge.net/psmisc/${pkgname/-selinux}-${pkgver}.tar.gz
psmisc-22.20-fix-selinux-in-pstree.patch)
sha1sums=('abdddc8d5c91251bba0f3190956ae9d05c058745'