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

[Andrea Scarpino]

    Date: Friday, February 8, 2013 @ 14:33:42
  Author: andrea
Revision: 177781

Upstream release; fix conflict (FS#33762)

Modified:
  digikam/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-08 13:13:42 UTC (rev 177780)
+++ PKGBUILD	2013-02-08 13:33:42 UTC (rev 177781)
@@ -5,8 +5,7 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.0.0rc
-_pkgver=3.0.0-rc
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
@@ -15,17 +14,14 @@
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen' 'mesa')
-#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-source=("http://download.kde.org/unstable/${pkgname}/${pkgname}-${_pkgver}.tar.bz2")
-sha1sums=('7c8dac61dc344221ce829527be7dcfeddf4d524e')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('45a9490b2b10b7b42fa9f90b7389eeb248326718')
 
 build() {
-  cd "${srcdir}"
-
   mkdir build
   cd build
   # Use internal lensfun (FS#21816)
-  cmake ../${pkgname}-${_pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
@@ -41,19 +37,22 @@
   optdepends=('kipi-plugins: for more extras and plugins')
   install=digikam.install
 
-  cd "${srcdir}"/build/core
+  cd build/core
   make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc
+  cd ../../build/doc
   make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/po
+  cd ../../build/po
   make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts with kde-l10n-*
+  rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo
 }
 
 package_libkface() {
   pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
   depends=('kdelibs' 'opencv')
 
-  cd "${srcdir}"/build/extra/libkface
+  cd build/extra/libkface
   make DESTDIR="${pkgdir}" install
 }
 
@@ -61,7 +60,7 @@
   pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
   depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
 
-  cd "${srcdir}"/build/extra/libkgeomap
+  cd build/extra/libkgeomap
   make DESTDIR="${pkgdir}" install
 }
 
@@ -69,7 +68,7 @@
   pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
   depends=('kdelibs' 'qjson')
 
-  cd "${srcdir}"/build/extra/libkvkontakte
+  cd build/extra/libkvkontakte
   make DESTDIR="${pkgdir}" install
 }
 
@@ -77,7 +76,7 @@
   pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
   depends=('kdelibs')
 
-  cd "${srcdir}"/build/extra/libmediawiki
+  cd build/extra/libmediawiki
   make DESTDIR="${pkgdir}" install
 }
 
@@ -91,6 +90,6 @@
               'hugin')
   install=kipi-plugins.install
 
-  cd "${srcdir}"/build/extra/kipi-plugins
+  cd build/extra/kipi-plugins
   make DESTDIR="${pkgdir}" install
 }