Provide and conflict with xdg-utils

2 files changed, 6 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f0eb751185e..1a9e84c060c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xdg-utils-no-open
 	pkgdesc = Command line tools that assist applications with a variety of desktop integration tasks
 	pkgver = 1.1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.freedesktop.org/wiki/Software/xdg-utils/
 	arch = any
 	license = MIT
@@ -12,6 +12,8 @@ pkgbase = xdg-utils-no-open
 	depends = sh
 	depends = xorg-xset
 	optdepends = linopen: for xdg-open support
+	provides = xdg-utils
+	conflicts = xdg-utils
 	source = https://portland.freedesktop.org/download/xdg-utils-1.1.2.tar.gz
 	sha1sums = 20cd4cc5cfaa904b12abf6d584deb568367f4d83
 
diff --git a/PKGBUILD b/PKGBUILD
index f5c50aa84eeb..6d721a021e62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=xdg-utils-no-open
 _pkgname=xdg-utils
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks"
 arch=('any')
 url="http://www.freedesktop.org/wiki/Software/xdg-utils/"
@@ -9,18 +9,11 @@ license=('MIT')
 depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver
 makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git')
 optdepends=('linopen: for xdg-open support')
+provides=('xdg-utils')
+conflicts=('xdg-utils')
 source=(https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz)
 sha1sums=('20cd4cc5cfaa904b12abf6d584deb568367f4d83')
 
-# Set this 1 to conflict with xdg-utils so you can
-# go without xdg-open for whatever reason
-PROVIDE_XDG_OPEN=0
-
-if [ $PROVIDE_XDG_OPEN -eq 1 ]; then
-   provides=('xdg-utils')
-   conflicts=('xdg-utils')
-fi
-
 prepare(){
     cd $_pkgname-$pkgver/scripts
     sed -i -e '20 h' -e '20 d' -e '23 c \    xdg-settings\n#    xdg-open' Makefile.in