[mingw-gdbm: 3/16] - Update config.sub and config.guess. - Patch to use libtool-2-style commands.

[epienbro]

commit 61dcd401c854cf09e34edbc0cae62d67e4b6a8d3
Author: Richard W.M. Jones <rjones at fedoraproject.org>
Date:   Sat Jan 17 12:26:57 2009 +0000

    - Update config.sub and config.guess.
    - Patch to use libtool-2-style commands.

 mingw32-gdbm-1.8.0-libtool-install.patch |   11 +++++++++++
 mingw32-gdbm.spec                        |   26 ++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/mingw32-gdbm-1.8.0-libtool-install.patch b/mingw32-gdbm-1.8.0-libtool-install.patch
new file mode 100644
index 0000000..9ebd9a6
--- /dev/null
+++ b/mingw32-gdbm-1.8.0-libtool-install.patch
@@ -0,0 +1,11 @@
+--- gdbm-1.8.0/Makefile.in.libtool-install	2009-01-17 12:16:36.000000000 +0000
++++ gdbm-1.8.0/Makefile.in	2009-01-17 12:19:11.000000000 +0000
+@@ -117,7 +117,7 @@
+ 
+ install: libgdbm.la gdbm.h gdbm.info
+ 	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
+-	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
++	$(LIBTOOL) --mode=install install libgdbm.la $(libdir)/libgdbm.la
+ 	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
+ 	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
+ 	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
diff --git a/mingw32-gdbm.spec b/mingw32-gdbm.spec
index 8ea56e2..00c8a5f 100644
--- a/mingw32-gdbm.spec
+++ b/mingw32-gdbm.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-gdbm
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW port of GNU database routines
 
 License:        GPLv2+
@@ -20,7 +20,8 @@ Patch1:         gdbm-1.8.0-fhs.patch
 Patch2:         gdbm-1.8.0-cflags.patch
 Patch3:         gdbm-1.8.0-64offset.patch
 
-Patch100:       mingw32-gdbm-1.8.0-windows.patch
+Patch1000:      mingw32-gdbm-1.8.0-windows.patch
+Patch1001:      mingw32-gdbm-1.8.0-libtool-install.patch
 
 BuildArch:      noarch
 
@@ -29,6 +30,7 @@ BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
 BuildRequires:  libtool
+BuildRequires:  automake
 
 
 %description
@@ -48,14 +50,26 @@ This is the MinGW Windows port of the libraries and development tools.
 %patch2 -p 1 -b .cflags
 %patch3 -p1 -b .offset
 
-%patch100 -p1 -b .windows
+%patch1000 -p1 -b .windows
+%patch1001 -p1 -b .libtool-install
 
 
 %build
+# Update the version of libtool.
 libtoolize --force --copy
+
 aclocal
-autoreconf
+
+# We want to update config.sub and config.guess because the ones
+# shipped with gdbm are ancient history.  However note that there is
+# no Makefile.am -- we are only using automake for convenience here!
+rm -f config.sub config.guess
+automake --add-missing ||:
+
+autoconf
+
 %{_mingw32_configure}
+# NB: %{?_smp_mflags} causes build to fail.
 make libdir=%{_mingw32_libdir} all progs
 
 
@@ -104,5 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 17 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-2
+- Update config.sub and config.guess.
+- Patch to use libtool-2-style commands.
+
 * Fri Oct  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
 - Initial RPM release.