summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Pagani2016-12-26 03:46:37 +0100
committerBruno Pagani2016-12-26 03:46:37 +0100
commit71f2fafce397bee0ffe12d80b77fa13e2bbc80e8 (patch)
treef30d7be41b8bafde0e20869c5d1707061d17033e
parent7cc8686dd38c4cebfe9175ece6a9ee969e7b778f (diff)
downloadaur-71f2fafce397bee0ffe12d80b77fa13e2bbc80e8.tar.gz
Fix wrong pkgbase use
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD24
2 files changed, 14 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 611dd01bc8a5..80275ab7d9f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = scribus
+pkgbase = scribus-devel
pkgdesc = Desktop publishing software
pkgver = 1.5.2
pkgrel = 1
diff --git a/PKGBUILD b/PKGBUILD
index 61ffc3291676..3633465385c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
# Contributor: tobias <tobias@archlinux.org>
# Contributor: Ben <ben@benmazer.net>
-pkgbase=scribus
-pkgname=scribus-devel
+_pkgname=scribus
+pkgname=${_pkgname}-devel
pkgver=1.5.2
pkgrel=1
pkgdesc="Desktop publishing software"
@@ -18,16 +18,16 @@ depends=('hunspell' 'libcdr' 'libcups' 'libmspub' 'libpagemaker'
'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info')
makedepends=('cmake' 'boost' 'mesa' 'qt5-tools')
optdepends=('tk: scripts based on tkinter')
-conflicts=("${pkgbase}")
-provides=("${pkgbase}")
-source=("https://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.xz"{,.asc})
+conflicts=("${_pkgname}")
+provides=("${_pkgname}")
+source=("https://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"{,.asc})
sha256sums=('ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5' 'SKIP')
validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA')
prepare() {
mkdir -p build
- cd ${pkgbase}-${pkgver}
+ cd ${_pkgname}-${pkgver}
sed \
-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
@@ -37,7 +37,7 @@ prepare() {
build() {
cd build
- cmake ../${pkgbase}-${pkgver} \
+ cmake ../${_pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
@@ -45,15 +45,17 @@ build() {
make
}
-package_scribus-devel() {
+package() {
cd build
make DESTDIR="${pkgdir}" install
- install -Dm644 ../${pkgbase}-${pkgver}/scribus.desktop "${pkgdir}"/usr/share/applications/scribus.desktop
+
+ cd ../${_pkgname}-${pkgver}
+
+ install -Dm644 scribus.desktop "${pkgdir}"/usr/share/applications/scribus.desktop
for i in 16x16 32x32 128x128 256x256 512x512 1024x1024
do
- install -Dm644 ../${pkgbase}-${pkgver}/resources/iconsets/artwork/icon_${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}/apps/scribus.png
+ install -Dm644 resources/iconsets/artwork/icon_${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}/apps/scribus.png
done
}
-