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

[Gaetan Bisson]

    Date: Wednesday, October 7, 2015 @ 21:49:40
  Author: bisson
Revision: 143314

fix FS#46593

Modified:
  scribus/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-07 18:31:17 UTC (rev 143313)
+++ PKGBUILD	2015-10-07 19:49:40 UTC (rev 143314)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -24,17 +24,16 @@
 
 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
+	install -d build
 }
 
 build() {
-	cd "${srcdir}/build"
-	cmake "../${pkgname}-${pkgver}" \
+	cd "${srcdir}/${pkgname}-${pkgver}/build"
+	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
@@ -43,7 +42,8 @@
 }
 
 package() {
-	cd "${srcdir}/build"
+	cd "${srcdir}/${pkgname}-${pkgver}/build"
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
+	install -Dm644 ../scribus.desktop "${pkgdir}/usr/share/applications/scribus.desktop"
+	install -Dm644 ../resources/icons/AppIcon.png "${pkgdir}/usr/share/icons/hicolor/32x32/scribus.png"
 }