From f787b8fd08e2640b19cd518462685e27d91fc0e0 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 7 Aug 2012 22:25:47 +1100 Subject: [PATCH] New version 2.3.1 (sync with Cooker), fix unversioned Obsoletes --- .abf.yml | 2 +- unixODBC.spec | 108 ++++++++++++++++++++------------------------------ 2 files changed, 45 insertions(+), 65 deletions(-) diff --git a/.abf.yml b/.abf.yml index 1ee0898..d3dfffc 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "unixODBC-2.3.0.tar.gz": b2839b5210906e3ee286a4b621f177db9c7be7a8 + "unixODBC-2.3.1.tar.gz": 815cbc4f34e1a6d95daf3a5ab74e6ed3a586aad7 diff --git a/unixODBC.spec b/unixODBC.spec index d5c75d2..6fba07e 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,23 +1,20 @@ -%define LIBMAJ 1 -%define libname %mklibname %name %LIBMAJ -%define develname %mklibname %name -d -%define sdevelname %mklibname %name -d -s -%define old_libname %mklibname %{name} 2 +%define major 2 +%define libname %mklibname %{name} %{major} +%define develname %mklibname %{name} -d -Name: unixODBC -Version: 2.3.0 -Release: %mkrel 6 -Group: Databases -Summary: Unix ODBC driver manager and database drivers -License: GPLv2+ and LGPLv2+ -URL: http://www.unixODBC.org/ +Summary: Unix ODBC driver manager and database drivers +Name: unixODBC +Version: 2.3.1 +Release: 3 +Group: Databases +License: GPLv2+ and LGPLv2+ +URL: http://www.unixODBC.org/ Source0: http://www.unixodbc.org/%{name}-%{version}.tar.gz -BuildRequires: bison -BuildRequires: flex -BuildRequires: readline-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: readline-devel BuildRequires: byacc BuildRequires: libltdl-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description UnixODBC is a free/open specification for providing application developers @@ -25,40 +22,23 @@ with a predictable API with which to access Data Sources. Data Sources include SQL Servers and any Data Source with an ODBC Driver. %package -n %{libname} -Summary: Libraries unixODBC +Summary: Libraries unixODBC Group: System/Libraries -Provides: %{old_libname} -Obsoletes: %{old_libname} +Obsoletes: %{mklibname unixODBC 1} < 2.3.1 %description -n %{libname} -unixODBC libraries. +This package contains the shared unixODBC libraries. %package -n %{develname} Summary: Includes and shared libraries for ODBC development Group: Development/Other -Requires: %{libname} = %{version} +Requires: %{libname} >= %{version}-%{release} Provides: %{name}-devel = %{version}-%{release} -Provides: lib%{name}-devel = %{version}-%{release} -Obsoletes: %{old_libname}-devel -Obsoletes: %{_lib}unixODBC1-devel < %{version}-%{release} %description -n %{develname} unixODBC aims to provide a complete ODBC solution for the Linux platform. This package contains the include files and shared libraries for development. -%package -n %{sdevelname} -Summary: Static libraries for ODBC development -Group: Development/Other -Requires: %{develname} = %{version}-%{release} -Provides: %{name}-static-devel = %{version}-%{release} -Provides: lib%{name}-static-devel = %{version}-%{release} -Obsoletes: %{name}-devel %{old_libname}-static-devel -Obsoletes: %{_lib}unixODBC1-static-devel < %{version}-%{release} - -%description -n %{sdevelname} -unixODBC aims to provide a complete ODBC solution for the Linux platform. -This package contains static libraries for development. - %prep %setup -q @@ -67,23 +47,16 @@ This package contains static libraries for development. --with-included-ltdl=no \ --with-ltdl-include=%{_includedir} \ --with-ltdl-lib=%{_libdir} \ - --enable-static \ + --disable-static \ --enable-drivers %make %install -rm -rf %{buildroot} %makeinstall_std -%multiarch_binaries %buildroot/%_bindir/odbc_config - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root) +%files %doc AUTHORS INSTALL ChangeLog NEWS README -%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/odbc*.ini +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/odbc*.ini %dir %{_sysconfdir}/ODBCDataSources %{_bindir}/dltest %{_bindir}/isql @@ -91,31 +64,38 @@ rm -rf %{buildroot} %{_bindir}/iusql %files -n %{libname} -%defattr(-,root, root) -%_libdir/libodbc.so.%{LIBMAJ}* -%_libdir/libodbccr.so.%{LIBMAJ}* -%_libdir/libodbcinst.so.%{LIBMAJ}* -%_libdir/libnn.so.%{LIBMAJ}* -%_libdir/libtemplate.so.%{LIBMAJ}* -%_libdir/libodbcpsql.so.2 -%_libdir/libodbcpsql.so.2.* +%{_libdir}/libodbccr.so.%{major}* +%{_libdir}/libodbcinst.so.%{major}* +%{_libdir}/libodbcpsql.so.%{major}* +%{_libdir}/libodbc.so.%{major}* +%{_libdir}/libnn.so.1* +%{_libdir}/libtemplate.so.1* %files -n %{develname} -%defattr(-,root,root) %doc doc/ -%_bindir/odbc_config +%{_bindir}/odbc_config %{_includedir}/* %{_libdir}/lib*.so -%{_libdir}/*.la %{multiarch_bindir}/odbc_config -%files -n %{sdevelname} -%defattr(-,root,root) -%{_libdir}/*.a - %changelog -* Mon May 02 2011 Oden Eriksson 2.3.0-3mdv2011.0 +* Thu Dec 08 2011 Oden Eriksson 2.3.1-2 ++ Revision: 739158 +- use the wrong way to save time... + +* Thu Dec 08 2011 Oden Eriksson 2.3.1-1 ++ Revision: 739097 +- 2.3.1 +- new major 2 (again) +- various cleanups + +* Tue Dec 06 2011 Oden Eriksson 2.3.0-4 ++ Revision: 738300 +- drop the static lib, its sub package and the libtool *.la file +- various fixes + +* Mon May 02 2011 Oden Eriksson 2.3.0-3 + Revision: 661753 - multiarch fixes @@ -194,7 +174,7 @@ rm -rf %{buildroot} - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - + Olivier Blin + + Olivier Blin - restore BuildRoot * Wed Nov 21 2007 Helio Chissini de Castro 2.2.12-4mdv2008.1