Fixed lack of package() issue and updated to handle new version of automake

4 files changed, 22 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0158d08305d..83fe1466d408 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gimp-plugin-deskew-git
 	pkgdesc = Auto straighten lines of text in scanned documents
 	pkgver = 1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/prokoudine/gimp-deskew-plugin
 	arch = x86_64
 	license = GPL
@@ -9,8 +9,8 @@ pkgbase = gimp-plugin-deskew-git
 	depends = gimp
 	provides = gimp-plugin-deskew
 	conflicts = gimp-plugin-deskew
-	source = autogen.sh.patch
-	md5sums = 90ce5c6a84fb8b67a034badad0dd6758
+	source = autogen.patch
+	sha256sums = b64799de98d8089790752d35ad8b1b1c5bc387a725b21cf2bd08589b26258b58
 
 pkgname = gimp-plugin-deskew-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b2565630ed26..3412bea2e106 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gimp-plugin-deskew-git
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Auto straighten lines of text in scanned documents"
 arch=('x86_64')
 #(old) url="http://www.cubewano.org/gimp-deskew-plugin/"
@@ -16,13 +16,13 @@ depends=('gimp')
 makedepends=('git')
 provides=('gimp-plugin-deskew')
 conflicts=('gimp-plugin-deskew')
-source=('autogen.sh.patch')
-md5sums=('90ce5c6a84fb8b67a034badad0dd6758')
+source=('autogen.patch')
+sha256sums=('b64799de98d8089790752d35ad8b1b1c5bc387a725b21cf2bd08589b26258b58')
 
 _gitroot='git://github.com/prokoudine/gimp-deskew-plugin.git'
 _gitname='gimp-deskew-plugin'
 
-build() {
+package() {
   cd "$srcdir"
   msg "Connecting to GIT server...."
 
@@ -45,7 +45,7 @@ build() {
   #
   # Of course it's incompatible with newest autoconf >_<
   msg "Patching autogen.sh for autoconf-1.12"
-  patch -u -F5 -N autogen.sh ../../autogen.sh.patch
+  patch -u -F5 -N autogen.sh ../../autogen.patch
   msg "autogen.sh"
   ./autogen.sh --prefix=/usr
   msg "make"
@@ -53,9 +53,8 @@ build() {
   msg "make install"
   make DESTDIR="$pkgdir/" install
   # hack to correct broken make --install
-  mv $pkgdir/usr/usr/lib $pkgdir/usr/
-  rmdir $pkgdir/usr/usr
+  mv "$pkgdir/usr/usr/lib" "$pkgdir/usr"
+  rmdir "$pkgdir/usr/usr"
 }
 
-# vim:set ts=2 sw=2 et:
 
diff --git a/autogen.patch b/autogen.patch
new file mode 100644
index 000000000000..13044d280f4c
--- /dev/null
+++ b/autogen.patch
@@ -0,0 +1,12 @@
+--- autogen.sh	2016-05-12 18:59:11.639463589 -0400
++++ autogen_new.sh	2016-05-12 19:07:13.118343037 -0400
+@@ -86,6 +86,9 @@
+ elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.14
+    ACLOCAL=aclocal-1.14
++elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-1.15
++   ACLOCAL=aclocal-1.15
+ else
+     echo
+     echo "  You must have automake 1.6 or newer installed to compile $PROJECT."
diff --git a/autogen.sh.patch b/autogen.sh.patch
deleted file mode 100644
index 30ff6c5a9fa7..000000000000
--- a/autogen.sh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ../gimp-deskew-plugin/autogen.sh	2012-05-23 16:25:29.061601683 +0930
-+++ autogen.sh	2012-05-23 16:48:42.028349067 +0930
-@@ -67,20 +67,29 @@
-    ACLOCAL=aclocal-1.7
- elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.8
-    ACLOCAL=aclocal-1.8
- elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.9
-    ACLOCAL=aclocal-1.9
- elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-+elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.12
-+   ACLOCAL=aclocal-1.12
-+elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.13
-+   ACLOCAL=aclocal-1.13
-+elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.14
-+   ACLOCAL=aclocal-1.14
- elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.6
-    ACLOCAL=aclocal-1.6
- else
-     echo
-     echo "  You must have automake 1.6 or newer installed to compile $PROJECT."
-     echo "  Download the appropriate package for your distribution,"
-     echo "  or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
-     DIE=1
- fi