Remove extraneous provides and conflicts

2 files changed, 4 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82042166c300..7c5710d3c4a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Apr 18 15:48:03 UTC 2017
+# Wed Apr 26 20:45:35 UTC 2017
 pkgbase = compiz-core
 	pkgdesc = This is the latest stable release of Compiz without DE deps
 	pkgver = 0.8.14
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/compiz-reloaded/compiz/
 	arch = i686
 	arch = x86_64
@@ -28,10 +28,7 @@ pkgbase = compiz-core
 
 pkgname = compiz-core
 	pkgdesc = This is the latest stable release of Compiz without DE deps (Core w/o decorator)
-	provides = compiz-core=0.8.14
 	conflicts = compiz
-	conflicts = compiz-core-git
-	conflicts = compiz-git
 
 pkgname = compiz-gtk
 	pkgdesc = This is the latest stable release of Compiz without DE deps (GTK+ window decorator)
@@ -49,5 +46,4 @@ pkgname = compiz-gtk
 	depends = marco-gtk2
 	depends = libwnck3
 	depends = libwnck
-	conflicts = compiz-gtk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index dbcfa9d6d0dd..7abc0d79241f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _micro=""
 pkgbase=compiz-core
 pkgname=(compiz-core compiz-gtk)
 pkgver="${_pkgver}${_micro}"
-pkgrel=3
+pkgrel=4
 pkgdesc="This is the latest stable release of Compiz without DE deps"
 url="https://github.com/compiz-reloaded/${_upstream}/"
 license=('GPL' 'LGPL' 'MIT')
@@ -79,8 +79,7 @@ package_compiz-core() {
   cd "${srcdir}/${_upstream}-${pkgver}"
 
   pkgdesc+=" (Core w/o decorator)"
-  provides=("compiz-core=$pkgver")
-  conflicts=('compiz' 'compiz-core-git' 'compiz-git')
+  conflicts=('compiz')
 
   make DESTDIR="${pkgdir}" install
 
@@ -116,7 +115,6 @@ package_compiz-gtk()
   fi
 
   pkgdesc+=" (GTK+ window decorator)"
-  conflicts=('compiz-gtk-git')
 
   cd "${srcdir}/${_upstream}-${pkgver}/gtk-window-decorator"
   make DESTDIR="${pkgdir}" install