Sun Jul 14 01:49:07 PDT 2013

3 files changed, 41 insertions, 44 deletions

diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 9cf031abd..cc72b3aef 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,52 +1,49 @@
-# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $
+# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=2
-pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64')
-url="http://www.scribus.net"
+pkgrel=3
+pkgdesc='Desktop publishing software'
+url="http://www.scribus.net/"
 license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
-         'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
-         'desktop-file-utils' 'shared-mime-info' \
-         'hyphen' 'aspell' 'boost-libs')
+arch=('i686' 'x86_64')
 makedepends=('cmake' 'boost' 'mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
+         'ghostscript' 'python2' 'aspell' 'boost-libs'
+         'desktop-file-utils' 'shared-mime-info')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
-build() {
-	cd "${srcdir}"
+options=('!libtool')
+install=install
 
-	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-               scribus-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
+	sed \
+		-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+		-e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+		-i scribus/plugins/scriptplugin/{samples,scripts}/*
+	install -d ../build
+}
 
-	mkdir build
-	cd build
-	cmake ../scribus-${pkgver} \
-	   -DCMAKE_INSTALL_PREFIX=/usr \
-	   -DCMAKE_BUILD_TYPE=Release \
-	   -DCMAKE_SKIP_RPATH=ON \
-	   -DWANT_CAIRO=1 \
-	   -DLIB_SUFFIX=""
+build() {
+	cd "${srcdir}/build"
+	cmake "../${pkgname}-${pkgver}" \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DLIB_SUFFIX=""
 	make
 }
 
 package() {
 	cd "${srcdir}/build"
 	make DESTDIR="${pkgdir}" install
-
-	# fix icon path in .desktop file
-	sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-	   "${srcdir}/scribus-${pkgver}/scribus.desktop"
-
-	install -Dm644 "${srcdir}/scribus-${pkgver}/scribus.desktop" \
-	   "${pkgdir}/usr/share/applications/scribus.desktop"
+	install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
 }
diff --git a/extra/scribus/install b/extra/scribus/install
new file mode 100644
index 000000000..8040f715b
--- /dev/null
+++ b/extra/scribus/install
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install
deleted file mode 100644
index 52a6286ac..000000000
--- a/extra/scribus/scribus.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}