[arch-commits] Commit in scribus/repos (3 files)

[Ronald van Haren]

    Date: Sunday, August 16, 2009 @ 17:11:14
  Author: ronald
Revision: 49912

Merged revisions 49854 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/scribus/trunk

........
  r49854 | ronald | 2009-08-16 20:53:16 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: scribus 1.3.5.1-1
      FS#12699, bump to latest version, fix install file & update deps
........

Modified:
  scribus/repos/extra-i686/	(properties)
  scribus/repos/extra-i686/PKGBUILD
  scribus/repos/extra-i686/scribus.install

-----------------+
 PKGBUILD        |   27 +++++++++++++++------------
 scribus.install |    8 ++------
 2 files changed, 17 insertions(+), 18 deletions(-)


Property changes on: scribus/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /scribus/trunk:1-45117
   + /scribus/trunk:1-49911

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-16 21:05:41 UTC (rev 49911)
+++ extra-i686/PKGBUILD	2009-08-16 21:11:14 UTC (rev 49912)
@@ -4,31 +4,34 @@
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=scribus
-pkgver=1.3.3.13
-pkgrel=2
+pkgver=1.3.5.1
+pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scribus.net"
-install=${pkgname}.install
-depends=('libcups>=1.3.10' 'lcms>=1.18' 'qt3>=3.3.8' 'ghostscript>=8.64' \
-         'libart-lgpl>=2.3.20' 'python>=2.6.1' 'libxml2>=2.7.3' 'cairo' \
-         'desktop-file-utils')
+install=scribus.install
+depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt>=4.5.2' 'ghostscript>=8.70' \
+         'libart-lgpl>=2.3.20' 'python>=2.6.2' 'libxml2>=2.7.3' 'cairo' \
+         'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')
 options=(!libtool !makeflags)
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e698b0d118c7f037e57163cba302d96e')
+md5sums=('4cadca0c780491ad61dc2d815776f10b')
 
 build() {
-  # Source the QT profile
-  source /etc/profile.d/qt3.sh
-
   cd ${srcdir}/scribus-${pkgver}
   cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-   -DWANT_CAIRO=1 -DLIB_SUFFIX=""
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_SKIP_RPATH=ON \
+          -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--as-needed' \
+	  -DWANT_CAIRO=1 -DLIB_SUFFIX="" 
   make || return 1
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 vnd.scribus.desktop \
+  # fix icon path in .desktop file
+  sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' scribus.desktop
+
+  install -Dm644 scribus.desktop \
     ${pkgdir}/usr/share/applications/scribus.desktop
 }

Modified: extra-i686/scribus.install
===================================================================
--- extra-i686/scribus.install	2009-08-16 21:05:41 UTC (rev 49911)
+++ extra-i686/scribus.install	2009-08-16 21:11:14 UTC (rev 49912)
@@ -1,19 +1,15 @@
 
 post_install() {
   echo "update desktop mime database..."
+  update-mime-database usr/share/mime
   update-desktop-database -q
 }
-
 post_upgrade() {
   post_install $1
 }
 
 post_remove() {
   echo "update desktop mime database..."
+  update-mime-database usr/share/mime 
   update-desktop-database -q
 }
-
-op=$1
-shift
-
-$op $*