- 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

@@ -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.

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
 

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 <pharvey@codebydesigns.com>
-    Nick Gorham <nick@easysoft.com>
-
 %description devel
 Includes for ODBC development (based on unixODBC).
 
-
-
-Authors:
---------
-    Peter Harvey <pharvey@codebydesigns.com>
-    Nick Gorham <nick@easysoft.com>
-
 %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
+autoreconf -fvi
-export CFLAGS="%optflags -fno-strict-aliasing"
-export CXXFLAGS="%optflags -fno-strict-aliasing"
 %configure \
-	    --prefix=%{_prefix} \
+    --with-gnu-ld \
-	    --mandir=%{_mandir} \
+    --enable-ltdllib \
-	    --infodir=%{_infodir} \
+    --sysconfdir=%{_sysconfdir}/%{name} \
-	    --libdir=%{_libdir} \
+    --enable-iconv \
-	    --sysconfdir=%{_sysconfdir}/%{name} \
+    --with-iconv-char-enc=UTF8 \
-	    --enable-gui=no \
+    --with-iconv-ucode-enc=UTF16LE \
-	    --disable-stats \
+    --enable-threads \
-		--enable-drivers \
+    --enable-gui=no \
-		--enable-driver-conf
+    --disable-stats \
-make
+    --enable-driverc \
+    --enable-drivers \
+    --enable-driver-conf
+make %{?_smp_mflags}
 
 %install
-install -d -m 755 "%buildroot/%_sysconfdir/%name"
+install -d -m 755 "%{buildroot}/%{_sysconfdir}/%{name}"
-install -d -m 755 "%buildroot/%_libdir/%name"
+install -d -m 755 "%{buildroot}/%{_libdir}/%{name}"
-make DESTDIR="%buildroot" install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
-rm -rf "%buildroot/%_datadir/libtool"
+rm -rf "%{buildroot}/%{_datadir}/libtool"
 # packaged in gui-gtk
-rm -f "%buildroot/%_libdir"/libmimerS.*
+rm -f "%{buildroot}/%{_libdir}"/libmimerS.*
-rm -f "%buildroot/%_libdir/%name"/*.la
+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
+%{_bindir}/dltest
-%{_prefix}/bin/isql
+%{_bindir}/isql
-%{_prefix}/bin/iusql
+%{_bindir}/iusql
-%{_prefix}/bin/odbcinst
+%{_bindir}/odbcinst
-%{_prefix}/bin/odbc_config
+%{_bindir}/odbc_config
-%{_prefix}/bin/slencheck
+%{_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