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

[Antonio Rojas]

    Date: Thursday, August 31, 2017 @ 18:36:21
  Author: arojas
Revision: 304408

Fix conflicts with libkvkontakte (FS#55451)

Modified:
  digikam/trunk/PKGBUILD

----------+
 PKGBUILD |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-31 18:34:29 UTC (rev 304407)
+++ PKGBUILD	2017-08-31 18:36:21 UTC (rev 304408)
@@ -7,7 +7,7 @@
 pkgname=('digikam' 'kipi-plugins')
 _pkgver=5.6.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=4
+pkgrel=5
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -26,6 +26,8 @@
 
 # sv docs fail to build
   sed -e '/sv/d' -i $pkgname-$pkgver/doc-translated/CMakeLists.txt
+# fix conflicts with libkvkontakte
+  rm $pkgbase-$pkgver/po/*/libkvkontakte.po
 # fix build with cmake 3.9
   cd $pkgbase-$pkgver/core
   patch -p1 -i ../../digikam-cmake-3.9.patch
@@ -63,7 +65,7 @@
   make DESTDIR="$pkgdir" install
 
 # Provided by kipi-plugins
-  rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{kipiplugin*,libkvkontakte}.mo
+  rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/kipiplugin*.mo
 }
 
 package_kipi-plugins() {