diff --git a/unixODBC-gui-qt.spec b/unixODBC-gui-qt.spec index 7934db3..2f7db17 100644 --- a/unixODBC-gui-qt.spec +++ b/unixODBC-gui-qt.spec @@ -1,7 +1,7 @@ # # spec file for package unixODBC-gui-qt (Version 2.2.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: unixODBC-gui-qt BuildRequires: qt3-devel Version: 2.2.12 -Release: 197 +Release: 198 Summary: ODBC Configuration Utility, Data Source Browser, and ODBC Test Tool based License: GPL v2 or later Url: http://www.unixodbc.org/ diff --git a/unixODBC.changes b/unixODBC.changes index bec099a..25ad001 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 7 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Mon Oct 13 15:33:25 CEST 2008 - nadvornik@suse.cz diff --git a/unixODBC.spec b/unixODBC.spec index 9ec3270..1ee92fd 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ # # spec file for package unixODBC (Version 2.2.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,17 @@ Name: unixODBC BuildRequires: gcc-c++ Version: 2.2.12 -Release: 119 +Release: 120 Summary: ODBC driver manager with some drivers included License: GPL v2 or later; LGPL v2.1 or later Url: http://www.unixodbc.org/ Group: Productivity/Databases/Tools AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: unixODBC-64bit +%endif +# Provides: libodbcinst.so, libodbc.so %ifarch ia64 x86_64 s390x ppc64 Provides: libodbcinst.so()(64bit), libodbc.so()(64bit) @@ -50,6 +55,11 @@ License: GPL v2 or later; LGPL v2.1 or later Summary: Includes and Static Libraries for ODBC Development Group: Development/Libraries/C and C++ AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: unixODBC-devel-64bit +%endif +# Obsoletes: libiodbc-devel Requires: %{name} = %{version} @@ -157,12 +167,14 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/unixODBC/*.la %changelog +* Wed Jan 07 2009 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Mon Oct 13 2008 nadvornik@suse.cz - dropped the dlopen patch, it no longer matches * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support -* Sat May 26 2007 dmueller@suse.de +* Fri May 25 2007 dmueller@suse.de - add missing ldconfig fall to %%post/un * Wed Oct 18 2006 anosek@suse.cz - updated to version 2.2.12 @@ -219,7 +231,7 @@ rm -rf "$RPM_BUILD_ROOT" * Wed Apr 27 2005 ltinkl@suse.cz - updated to 2.2.11 - fix build with gcc4 -* Wed Apr 13 2005 ro@suse.de +* Tue Apr 12 2005 ro@suse.de - added audiofile-devel to neededforbuild * Fri Feb 11 2005 ltinkl@suse.cz - update to 2.2.10, adapt patches @@ -227,7 +239,7 @@ rm -rf "$RPM_BUILD_ROOT" - reduced neededforbuild * Tue Sep 14 2004 ltinkl@suse.cz - put the .desktop file in the right package (#44790) -* Tue Jul 27 2004 ro@suse.de +* Mon Jul 26 2004 ro@suse.de - fix some compiler warnings * Mon Jul 19 2004 ltinkl@suse.cz - update to 2.2.9 @@ -258,7 +270,7 @@ rm -rf "$RPM_BUILD_ROOT" - fix gODBCconfig configure.in for autoreconf * Wed Jul 30 2003 ltinkl@suse.de - update to version 2.2.6 -* Wed Jul 30 2003 ro@suse.de +* Tue Jul 29 2003 ro@suse.de - remove traces of buildroot from installed files * Fri Jul 18 2003 sbrabec@suse.cz - GNOME prefix change to /opt/gnome. @@ -271,7 +283,7 @@ rm -rf "$RPM_BUILD_ROOT" (remove them when they won't be needed to build) * Tue Nov 19 2002 ro@suse.de - add AM_GNU_GETTEXT_VERSION -* Mon Nov 18 2002 prehak@suse.cz +* Sun Nov 17 2002 prehak@suse.cz - fixed to build with autoconf 2.56 * Tue Nov 12 2002 tcrhak@suse.cz - fixed for bison 1.75: end rules with semicolons