diff --git a/unixODBC.changes b/unixODBC.changes index 7494482..2393321 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 8 07:51:54 UTC 2014 - jengelh@inai.de + +- Turn Obsoletes: libiodbc-devel back into Conflicts. + The iODBC project has not shut down, and unixODBC-devel does + _not_ provide all files from iODBC, like libiodbc.pc. +- Kill manual provides of libiodbc*.so, they are in the wrong spot + and thus never could have been effective. +- Remove redundant %clean section. + ------------------------------------------------------------------- Tue Jan 28 02:29:44 UTC 2014 - adler_187@yahoo.com diff --git a/unixODBC.spec b/unixODBC.spec index c84c5ae..b0a4e0f 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -31,12 +31,6 @@ Url: http://www.unixodbc.org/ Obsoletes: unixODBC-64bit %endif # -Provides: libodbc.so -Provides: libodbcinst.so -%ifarch ia64 x86_64 s390x ppc64 -Provides: libodbc.so()(64bit) -Provides: libodbcinst.so()(64bit) -%endif Source: ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-%{version}.tar.gz Source1: README.SuSE Source2: baselibs.conf @@ -58,7 +52,7 @@ Group: Development/Libraries/C and C++ Obsoletes: unixODBC-devel-64bit %endif # -Obsoletes: libiodbc-devel +Conflicts: libiodbc-devel Requires: %{name} = %{version} %description @@ -122,9 +116,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/libtool rm -f $RPM_BUILD_ROOT/%{_libdir}/libmimerS.* rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la -%clean -rm -rf "$RPM_BUILD_ROOT" - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig