Added a wrapper to set the environment variable locally.

5 files changed, 13 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9b5ca09edc8..aaeff4cb8c94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue Jun 27 13:27:36 UTC 2017
+# Wed Jul  5 01:53:36 UTC 2017
 pkgbase = pdftk
 	pkgdesc = Pdftk is a simple tool for doing everyday things with PDF documents
 	pkgver = 2.02
-	pkgrel = 13
+	pkgrel = 14
 	url = http://www.pdfhacks.com/pdftk
-	install = pdftk.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -14,10 +13,10 @@ pkgbase = pdftk
 	options = !makeflags
 	source = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
 	source = Makefile.Arch
-	source = pdftk.sh
+	source = pdftk
 	sha1sums = a4a27e984c5e1401cfa44b8e92a64113d7396a06
 	sha1sums = 50da68be80a2ed9cf9ae2c24d0016ea19f0eec0d
-	sha1sums = 764ed416147731567a0876b835204f4469b39ea1
+	sha1sums = e63351c2054c9a1bea16f6dfd5913d97304116e0
 
 pkgname = pdftk
 
diff --git a/PKGBUILD b/PKGBUILD
index 2339dc35d733..543b38a7bf7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pdftk
 pkgver=2.02
-pkgrel=13
+pkgrel=14
 pkgdesc="Pdftk is a simple tool for doing everyday things with PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.pdfhacks.com/pdftk"
@@ -14,12 +14,11 @@ depends=('gcc63-gcj' 'gcc-gcj-ecj')
 options=('!makeflags')
 source=("http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${pkgname}-${pkgver}-src.zip"
 	"Makefile.Arch"
-	"pdftk.sh"
+	"pdftk"
 )
-install=pdftk.install
 sha1sums=('a4a27e984c5e1401cfa44b8e92a64113d7396a06'
           '50da68be80a2ed9cf9ae2c24d0016ea19f0eec0d'
-          '764ed416147731567a0876b835204f4469b39ea1')
+          'e63351c2054c9a1bea16f6dfd5913d97304116e0')
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver-dist/$pkgname"
@@ -35,7 +34,7 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver-dist/$pkgname"
 
 	# Install binary
-	install -D -m 755 pdftk $pkgdir/usr/bin/pdftk
+	install -D -m 755 pdftk $pkgdir/usr/bin/pdftk-bin
 
 	# Install licenses and adjust permissions
 	cd ..
@@ -48,6 +47,6 @@ package() {
 	# Install manpage
 	install -D -m 644 "pdftk.1" "$pkgdir/usr/share/man/man1/pdftk.1"
 
-        # Install script to set env variables.
-	install -D -m 755 "${srcdir}/pdftk.sh" "${pkgdir}/etc/profile.d/pdftk.sh" 
+        # Install wrapper that sets the proper environment variables.
+	install -D -m 755 "${srcdir}/pdftk" "${pkgdir}/usr/bin/pdftk" 
 }
diff --git a/pdftk b/pdftk
new file mode 100644
index 000000000000..d69668c0399e
--- /dev/null
+++ b/pdftk
@@ -0,0 +1,3 @@
+#!/bin/bash
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1
+pdftk-bin
diff --git a/pdftk.install b/pdftk.install
deleted file mode 100644
index e37a4c35abd8..000000000000
--- a/pdftk.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-    echo "The pdftk binary needs LD_LIBRARY_PATH=/lib/gcc/x86_64-pc-linux-gnu/6.3.1"
-    echo "You thus need to relogin in order for pdftk to work properly"
-}
-
-post_upgrade() {
-  if [ $(vercmp $2 2.02-13) -lt 0 ]; then
-    post_install
-  fi
-}
diff --git a/pdftk.sh b/pdftk.sh
deleted file mode 100644
index 80f167c64f73..000000000000
--- a/pdftk.sh
+++ /dev/null
@@ -1 +0,0 @@
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib/gcc/x86_64-pc-linux-gnu/6.3.1