diff --git a/unixODBC-2.3.2-autotools.patch b/unixODBC-2.3.2-autotools.patch new file mode 100644 index 0000000..a291e07 --- /dev/null +++ b/unixODBC-2.3.2-autotools.patch @@ -0,0 +1,21 @@ +diff -up unixODBC-2.3.2/Makefile.am.old unixODBC-2.3.2/Makefile.am +--- unixODBC-2.3.2/Makefile.am.old 2015-08-11 10:45:46.340429001 +0200 ++++ unixODBC-2.3.2/Makefile.am 2015-08-11 10:45:51.532454100 +0200 +@@ -1,4 +1,4 @@ +-ACLOCAL_AMFLAGS=-I libltdl/m4 ++ACLOCAL_AMFLAGS=-I m4 + + SUBDIRS = \ + extras \ +diff -up unixODBC-2.3.2/configure.in.old unixODBC-2.3.2/configure.in +--- unixODBC-2.3.2/configure.in.old 2015-08-11 10:56:05.899423880 +0200 ++++ unixODBC-2.3.2/configure.in 2015-08-11 10:56:12.701456758 +0200 +@@ -133,7 +133,7 @@ LIBLTDL="" + AC_LIBTOOL_WIN32_DLL + dnl AC_PROG_LIBTOOL + +-AC_CONFIG_MACRO_DIR([libltdl/m4]) ++dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) + dnl LT_CONFIG_LTDL_DIR([libltdl]) + dnl LTDL_INIT + diff --git a/unixODBC.spec b/unixODBC.spec index 3dcd4b2..f398995 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ Summary: A complete ODBC driver manager for Linux Name: unixODBC Version: 2.3.2 -Release: 7%{?dist} +Release: 8%{?dist} Group: System Environment/Libraries URL: http://www.unixODBC.org/ # Programs are GPL, libraries are LGPL, except News Server library is GPL. @@ -21,6 +21,7 @@ Patch6: export-symbols.patch Patch8: so-version-bump.patch Patch9: keep-typedefs.patch Patch10: unixODBC-isql.1.patch +Patch11: unixODBC-2.3.2-autotools.patch Conflicts: iodbc @@ -49,6 +50,7 @@ ODBC, you need to install this package. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 -b .autotools chmod 0644 Drivers/MiniSQL/*.c chmod 0644 Drivers/nn/*.c @@ -59,14 +61,15 @@ chmod 0644 include/odbcinst.h # Blow away the embedded libtool and replace with build system's libtool. # (We will use the installed libtool anyway, but this makes sure they match.) -rm -rf config.guess config.sub install-sh ltmain.sh libltdl +rm -rf config.guess config.sub install-sh ltmain.sh libltdl depcomp missing # this hack is so we can build with either libtool 2.2 or 1.5 -libtoolize --install || libtoolize +libtoolize --install --copy || libtoolize --copy %build aclocal automake --add-missing +autoheader autoconf # unixODBC 2.2.14 is not aliasing-safe @@ -154,6 +157,9 @@ install -Dm644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/unixODBC.7 %postun -p /sbin/ldconfig %changelog +* Wed Aug 12 2015 Jan Stanek - 2.3.2-8 +- Backported changes necessary for building with new autotools version. + * Fri Jun 19 2015 Fedora Release Engineering - 2.3.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild