Updated PKGBUILD to match other pdfstudio packages

2 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cf0e1746c2f..4b6080986949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri May 27 10:32:59 UTC 2016
 pkgbase = pdfstudio8
 	pkgdesc = Review, annotate, and edit PDF Documents
 	pkgver = 8.4.0
-	pkgrel = 8
+	pkgrel = 9
 	url = http://www.qoppa.com/pdfstudio/
 	install = pdfstudio8.install
 	arch = x86_64
@@ -10,8 +12,10 @@ pkgbase = pdfstudio8
 	makedepends = pacman>=4.2.0
 	depends = java-runtime
 	depends = desktop-file-utils
-	provides = pdfstudio8
+	provides = pdfstudio
 	conflicts = pdfstudio
+	conflicts = pdfstudio9
+	conflicts = pdfstudio10
 	source = pdfstudio8.desktop
 	source = pdfstudio8.install
 	source = pdfstudio8.png
diff --git a/PKGBUILD b/PKGBUILD
index a600bc813e10..4e948aac640f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 pkgname=pdfstudio8
 pkgver=8.4.0
 _pkgver=v8_4_0
-pkgrel=8
+pkgrel=9
 pkgdesc="Review, annotate, and edit PDF Documents"
 arch=('x86_64' 'i686')
 url="http://www.qoppa.com/pdfstudio/"
 license=('custom')
-conflicts=('pdfstudio')
-provides=('pdfstudio8')
+conflicts=('pdfstudio' 'pdfstudio9' 'pdfstudio10')
+provides=('pdfstudio')
 makedepends=('pacman>=4.2.0')
 depends=('java-runtime' 'desktop-file-utils')
 depends_x86_64=('gcc-libs-multilib')
@@ -26,21 +26,23 @@ source=(${pkgname}.desktop
 		${pkgname}.install
 		${pkgname}.png)
 
+prepare() {
+	bsdtar xf data.tar.gz
+	bsdtar xf "opt/pdfstudio8/lib/pdfstudio.jar" resources/license.html
+
+	rm -rf "opt/pdfstudio8/jre"
+}
+
 package() {
     cd "$srcdir"
+            
+    install -dm 755 "${pkgdir}/opt"
+    install -Dm644 ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 ${pkgname}.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 resources/license.html "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.html"
     
-    bsdtar -xf data.tar.gz
-    bsdtar -xf "${srcdir}/opt/pdfstudio8/lib/pdfstudio.jar" resources/license.html
-    
-    rm -r "${srcdir}/opt/pdfstudio8/jre"
-        
-	install -dm 755 "${pkgdir}/opt"
-	install -Dm644 ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -Dm644 ${pkgname}.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-	install -Dm644 resources/license.html "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.html"
-    
-	cp -r opt/ "${pkgdir}"
-	mkdir -p "${pkgdir}/usr/bin"
+    cp -r opt/ "${pkgdir}"
+    mkdir -p "${pkgdir}/usr/bin"
     ln -s /opt/pdfstudio8/pdfstudio8 "${pkgdir}/usr/bin/pdfstudio"
  }