diff --git a/unixODBC.spec b/unixODBC.spec index d5aed23..3177e48 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ Summary: A complete ODBC driver manager for Linux Name: unixODBC Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries URL: http://www.unixODBC.org/ # Programs are GPL, libraries are LGPL, except News Server library is GPL. @@ -49,26 +49,17 @@ chmod 0644 doc/ProgrammerManual/Tutorial/*.html chmod 0644 doc/lst/* 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 depcomp missing compile -# this hack is so we can build with either libtool 2.2 or 1.5 -libtoolize --install --copy || libtoolize --copy +autoreconf -vfi + %build - -aclocal -automake --add-missing -autoheader -autoconf - # unixODBC 2.2.14 is not aliasing-safe CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="$CFLAGS" export CFLAGS CXXFLAGS %configure --with-gnu-ld=yes --enable-threads=yes \ - --enable-drivers=yes --enable-driverc=yes --enable-ltdllib + --enable-drivers=yes --enable-driverc=yes # Get rid of the rpaths sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -134,6 +125,9 @@ done %postun -p /sbin/ldconfig %changelog +* Tue Feb 20 2018 Pavel Raiskup - 2.3.5-2 +- cleanup autotool hacks + * Mon Feb 19 2018 Jan Staněk - 2.3.5-1 - Update to version 2.3.5