[gd] Fix FTBFS

[Peter Robinson]

commit 236d0d8a00c781c4c0ca265bb6369cc62e26167f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Dec 24 00:25:32 2013 +0000

    Fix FTBFS

 gd-fixautoconf.patch |   11 +++++++++++
 gd.spec              |   10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/gd-fixautoconf.patch b/gd-fixautoconf.patch
new file mode 100644
index 0000000..0ee26f7
--- /dev/null
+++ b/gd-fixautoconf.patch
@@ -0,0 +1,11 @@
+--- libgd-2.1.0/configure.ac.orig	2013-12-15 19:20:24.569994500 +0000
++++ libgd-2.1.0/configure.ac	2013-12-15 19:20:38.010142489 +0000
+@@ -45,7 +45,7 @@
+ FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
+ AC_SUBST(FEATURES)
+ 
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz subdir-objects -Wall -Werror])
+ AC_CONFIG_HEADERS([src/config.h:src/config.hin])
+ 
+ dnl newer automake wants this, but we still want to work with older
diff --git a/gd.spec b/gd.spec
index b923082..20a9f32 100644
--- a/gd.spec
+++ b/gd.spec
@@ -5,7 +5,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.1.0
-Release:       3%{?prever}%{?short}%{?dist}
+Release:       4%{?prever}%{?short}%{?dist}
 Group:         System Environment/Libraries
 License:       MIT
 URL:           http://libgd.bitbucket.org/
@@ -17,6 +17,7 @@ Source0:       libgd-%{version}-%{commit}.tgz
 Source0:       https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}%{?prever:-%{prever}}.tar.xz
 %endif
 Patch1:        gd-2.1.0-multilib.patch
+Patch2:        gd-fixautoconf.patch
 
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
@@ -73,6 +74,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
 %prep
 %setup -q -n libgd-%{version}%{?prever:-%{prever}}
 %patch1 -p1 -b .mlib
+%patch2 -p1 -b .automake
 
 # https://bitbucket.org/libgd/gd-libgd/issue/77
 sed -e '/GD_VERSION_STRING/s/-alpha//' \
@@ -82,7 +84,8 @@ grep VERSION src/gd.h
 
 : regenerate autotool stuff
 if [ -f configure ]; then
-   autoreconf -fi
+   libtoolize --copy --force
+   autoreconf -vif
 else
    ./bootstrap.sh
 fi
@@ -136,6 +139,9 @@ make check
 
 
 %changelog
+* Mon Dec 23 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.1.0-4
+- Fix FTBFS
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild