From cf023f126e4021a3f2965c9068932a5fc175ee2755250cd3fea3ae4989a38116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Dec 2014 10:13:30 +0000 Subject: [PATCH 1/2] Accepting request 263220 from home:jengelh:branches:server:database - Account for changes in libtool 2.4.3: remove ACLOCAL_AMFLAGS and explicit libtoolize call. - Replace $RPM_BUILD_ROOT by macro (fits with the other macros used) OBS-URL: https://build.opensuse.org/request/show/263220 OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=34 --- unixODBC.changes | 7 +++++++ unixODBC.spec | 25 +++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/unixODBC.changes b/unixODBC.changes index 2393321..63f2196 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 27 10:40:29 UTC 2014 - jengelh@inai.de + +- Account for changes in libtool 2.4.3: remove ACLOCAL_AMFLAGS + and explicit libtoolize call. +- Replace $RPM_BUILD_ROOT by macro (fits with the other macros used) + ------------------------------------------------------------------- Mon Sep 8 07:51:54 UTC 2014 - jengelh@inai.de diff --git a/unixODBC.spec b/unixODBC.spec index b0a4e0f..194ac11 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -17,9 +17,6 @@ Name: unixODBC -BuildRequires: bison -BuildRequires: gcc-c++ -BuildRequires: libtool Version: 2.3.2 Release: 0 Summary: ODBC driver manager with some drivers included @@ -43,6 +40,10 @@ Patch13: %{name}-2.3.1-uninitialized.patch Patch15: %{name}-2.3.1-bison.patch Patch16: %{name}-2.3.1-declarations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: automake +BuildRequires: bison +BuildRequires: gcc-c++ +BuildRequires: libtool %package devel Summary: Includes for ODBC Development @@ -89,12 +90,12 @@ Authors: install -m 644 %{S:1} . %build +perl -i -pe 's{^ACLOCAL_AMFLAGS.*}{}' Makefile.am export -n LANG LINGUAS LC_ALL rm -rf libltdl -libtoolize --ltdl autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%optflags -fno-strict-aliasing" +export CXXFLAGS="%optflags -fno-strict-aliasing" %configure \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ @@ -108,13 +109,13 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make %install -install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT/%{_libdir}/%{name} -make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/usr/share/libtool +install -d -m 755 "%buildroot/%_sysconfdir/%name" +install -d -m 755 "%buildroot/%_libdir/%name" +make DESTDIR="%buildroot" install +rm -rf "%buildroot/%_datadir/libtool" # packaged in gui-gtk -rm -f $RPM_BUILD_ROOT/%{_libdir}/libmimerS.* -rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la +rm -f "%buildroot/%_libdir"/libmimerS.* +rm -f "%buildroot/%_libdir/%name"/*.la %post -p /sbin/ldconfig From a8ffe02ab002b54b006e70cc1fb3b1ebf9b2b293f1ce5a2babeba69e4407f981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Dec 2014 12:25:32 +0000 Subject: [PATCH 2/2] - Move all .so files from devel as many ext apps dlopen those so you need these on regular package. - Clean up with spec-cleaner - Remove readme.suse as it is obsolete like hell - Wipe all la files as we don't provide static libs anyway - Do not append no-strict-aliasing to cflags, pointless - --enable-driverc enabled too OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=35 --- README.SuSE | 18 --------- unixODBC.changes | 11 ++++++ unixODBC.spec | 96 ++++++++++++++++++------------------------------ 3 files changed, 46 insertions(+), 79 deletions(-) delete mode 100644 README.SuSE diff --git a/README.SuSE b/README.SuSE deleted file mode 100644 index 678b198..0000000 --- a/README.SuSE +++ /dev/null @@ -1,18 +0,0 @@ -Dear customer, - -there occured some important changes in new version release of unixODBC-2.2.2 -package. The differences are particulary in paths to configuration files -and ODBC drivers, to avoid conflicts with another ODBC managers e.g. libiodbc. -The changes are the following: - -- configuration files odbc.ini and odbcinst.ini moved from /etc to - /etc/unixODBC - -- unixODBC drivers and driver config libraries moved from /usr/lib to - /usr/lib/unixODBC - -If you have any problems with configuration, please refer to the unixODBC -documentation for examples of .ini files. - -Have a lot of fun, -Your SuSE team. diff --git a/unixODBC.changes b/unixODBC.changes index 63f2196..060f805 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 1 12:25:00 UTC 2014 - tchvatal@suse.com + +- Move all .so files from devel as many ext apps dlopen those so + you need these on regular package. +- Clean up with spec-cleaner +- Remove readme.suse as it is obsolete like hell +- Wipe all la files as we don't provide static libs anyway +- Do not append no-strict-aliasing to cflags, pointless +- --enable-driverc enabled too + ------------------------------------------------------------------- Thu Nov 27 10:40:29 UTC 2014 - jengelh@inai.de diff --git a/unixODBC.spec b/unixODBC.spec index 194ac11..e5d5b90 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -23,13 +23,7 @@ Summary: ODBC driver manager with some drivers included License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Databases/Tools Url: http://www.unixodbc.org/ -# bug437293 -%ifarch ppc64 -Obsoletes: unixODBC-64bit -%endif -# Source: ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-%{version}.tar.gz -Source1: README.SuSE Source2: baselibs.conf Patch1: unixODBC-paths.patch Patch5: unixODBC-iaddr.patch @@ -39,44 +33,27 @@ Patch10: %{name}-2.3.1-libodbcinst-exports.patch Patch13: %{name}-2.3.1-uninitialized.patch Patch15: %{name}-2.3.1-bison.patch Patch16: %{name}-2.3.1-declarations.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: bison BuildRequires: gcc-c++ +BuildRequires: libltdl-devel BuildRequires: libtool +BuildRequires: readline-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel Summary: Includes for ODBC Development Group: Development/Libraries/C and C++ -# bug437293 -%ifarch ppc64 -Obsoletes: unixODBC-devel-64bit -%endif -# -Conflicts: libiodbc-devel Requires: %{name} = %{version} +Conflicts: libiodbc-devel %description UnixODBC aims to provide a complete ODBC solution for the Linux platform. Further drivers can be found at http://www.unixodbc.org/. - - -Authors: --------- - Peter Harvey - Nick Gorham - %description devel Includes for ODBC development (based on unixODBC). - - -Authors: --------- - Peter Harvey - Nick Gorham - %prep %setup -q %patch1 @@ -87,43 +64,43 @@ Authors: %patch13 %patch15 %patch16 -install -m 644 %{S:1} . %build perl -i -pe 's{^ACLOCAL_AMFLAGS.*}{}' Makefile.am export -n LANG LINGUAS LC_ALL rm -rf libltdl -autoreconf --force --install -export CFLAGS="%optflags -fno-strict-aliasing" -export CXXFLAGS="%optflags -fno-strict-aliasing" +autoreconf -fvi %configure \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ - --sysconfdir=%{_sysconfdir}/%{name} \ - --enable-gui=no \ - --disable-stats \ - --enable-drivers \ - --enable-driver-conf -make + --with-gnu-ld \ + --enable-ltdllib \ + --sysconfdir=%{_sysconfdir}/%{name} \ + --enable-iconv \ + --with-iconv-char-enc=UTF8 \ + --with-iconv-ucode-enc=UTF16LE \ + --enable-threads \ + --enable-gui=no \ + --disable-stats \ + --enable-driverc \ + --enable-drivers \ + --enable-driver-conf +make %{?_smp_mflags} %install -install -d -m 755 "%buildroot/%_sysconfdir/%name" -install -d -m 755 "%buildroot/%_libdir/%name" -make DESTDIR="%buildroot" install -rm -rf "%buildroot/%_datadir/libtool" +install -d -m 755 "%{buildroot}/%{_sysconfdir}/%{name}" +install -d -m 755 "%{buildroot}/%{_libdir}/%{name}" +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -rf "%{buildroot}/%{_datadir}/libtool" # packaged in gui-gtk -rm -f "%buildroot/%_libdir"/libmimerS.* -rm -f "%buildroot/%_libdir/%name"/*.la +rm -f "%{buildroot}/%{_libdir}"/libmimerS.* +rm -f %{buildroot}/%{_libdir}/*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README README.SuSE doc/*.html doc/*.gif +%doc AUTHORS COPYING ChangeLog NEWS README doc/*.html doc/*.gif %docdir %{_mandir} %{_mandir}/man1/isql.1.* %{_mandir}/man1/odbcinst.1.* @@ -134,25 +111,22 @@ rm -f "%buildroot/%_libdir/%name"/*.la %dir %{_libdir}/%{name} %config %{_sysconfdir}/%{name}/odbc.ini %config %{_sysconfdir}/%{name}/odbcinst.ini -%{_prefix}/bin/dltest -%{_prefix}/bin/isql -%{_prefix}/bin/iusql -%{_prefix}/bin/odbcinst -%{_prefix}/bin/odbc_config -%{_prefix}/bin/slencheck +%{_bindir}/dltest +%{_bindir}/isql +%{_bindir}/iusql +%{_bindir}/odbcinst +%{_bindir}/odbc_config +%{_bindir}/slencheck %{_libdir}/libodbc.so.* %{_libdir}/libodbcinst.so.* %{_libdir}/libodbccr.so.* +%{_libdir}/libodbc.so +%{_libdir}/libodbcinst.so +%{_libdir}/libodbccr.so %{_libdir}/%{name} %files devel %defattr(-, root, root) %{_includedir}/* -%{_libdir}/libodbc.so -%{_libdir}/libodbcinst.so -%{_libdir}/libodbc.la -%{_libdir}/libodbccr.la -%{_libdir}/libodbcinst.la -%{_libdir}/libodbccr.so %changelog