[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD)

[Andreas Radke]

    Date: Saturday, January 31, 2015 @ 11:17:40
  Author: andyrtr
Revision: 230311

cleanup provides/conflicts/replaces

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-31 10:09:34 UTC (rev 230310)
+++ PKGBUILD	2015-01-31 10:17:40 UTC (rev 230311)
@@ -284,8 +284,8 @@
 package_libreoffice-fresh-sdk() {
 	pkgdesc="Software Development Kit for LibreOffice Fresh"
 	depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
-	provides=('libreoffice-sdk' 'libreoffice-sdk-doc' 'libreoffice-still-sdk' 'libreoffice-still-sdk-doc')
-	conflicts=('libreoffice-sdk' 'libreoffice-sdk-doc' 'libreoffice-still-sdk' 'libreoffice-still-sdk-doc')
+	provides=('libreoffice-sdk')
+	conflicts=('libreoffice-still-sdk')
 
 	for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
 		install -dm755 ${pkgdir}/${dir/\%dir/}
@@ -336,22 +336,8 @@
 		etc/profile.d/libreoffice-fresh.sh
 		etc/profile.d/libreoffice-fresh.csh)
 	install=$pkgbase.install
-	provides=('libreoffice' 'libreoffice-common' 	'libreoffice-base' 'libreoffice-calc'
-		'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
-		'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
-		'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher'
-		'libreoffice-extension-nlpsolver' 'libreoffice-en-US')
-	conflicts=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc'
-		'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
-		'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
-		'libreoffice-extension-wiki-publisher' 'libreoffice-postgresql-connector'
-		'libreoffice-extension-nlpsolver' 'libreoffice-en-US'
-		'libreoffice-still-common' 'libreoffice-still-base' 'libreoffice-still-calc'
-		'libreoffice-still-draw' 'libreoffice-still-gnome' 'libreoffice-still-impress'
-		'libreoffice-still-kde4' 'libreoffice-still-math' 'libreoffice-still-writer'
-		'libreoffice-still-extension-wiki-publisher' 'libreoffice-still-postgresql-connector'
-		'libreoffice-still-extension-nlpsolver' 'libreoffice-still-en-US')
-	replaces=('libreoffice-fresh-en-US')
+	provides=('libreoffice' 'libreoffice-en-US')
+	conflicts=('libreoffice-still')
 
 	mv fakeinstall/* ${pkgdir}/