summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2017-02-28 20:45:11 +0100
committerNicolas Iooss2017-02-28 20:45:11 +0100
commitd807bd3d6f614f619f6bc495b932f751605b0170 (patch)
tree1d1f87b43d370a448b9ae9e4c1b3f211333315ae
parentc32c9e78ae9660fb9900d4cc648fd876c177edde (diff)
downloadaur-d807bd3d6f614f619f6bc495b932f751605b0170.tar.gz
dbus-docs-selinux conflicts with dbus-docs
Fixes: https://github.com/archlinuxhardened/selinux/issues/8
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2f455b773a9..b7dfa4d69bab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -39,4 +39,5 @@ pkgname = dbus-selinux
pkgname = dbus-docs-selinux
pkgdesc = Freedesktop.org message bus system with SELinux support (documentation)
depends = dbus-selinux
+ conflicts = dbus-docs
diff --git a/PKGBUILD b/PKGBUILD
index ae60375e20a7..e7c165716beb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -73,6 +73,7 @@ package_dbus-selinux() {
package_dbus-docs-selinux() {
pkgdesc+=" (documentation)"
depends=(dbus-selinux)
+ conflicts=("${pkgname/-selinux}")
install -d "$pkgdir/usr/share/licenses"
ln -s dbus-selinux "$pkgdir/usr/share/licenses/dbus-docs-selinux"