From c1607cf92de165299466a41b39c0efa67c597bd52842102f29a843f6230e55b2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 21 Jan 2010 10:14:43 +0000 Subject: [PATCH] Accepting request 29833 from server:database Copy from server:database/unixODBC based on submit request 29833 from user coolo OBS-URL: https://build.opensuse.org/request/show/29833 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unixODBC?expand=0&rev=7 --- unixODBC-gui-qt.spec | 28 +------ unixODBC.changes | 5 ++ unixODBC.spec | 186 ++----------------------------------------- 3 files changed, 13 insertions(+), 206 deletions(-) diff --git a/unixODBC-gui-qt.spec b/unixODBC-gui-qt.spec index 2f7db17..37ef684 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) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,9 +21,9 @@ Name: unixODBC-gui-qt BuildRequires: qt3-devel Version: 2.2.12 -Release: 198 +Release: 200 Summary: ODBC Configuration Utility, Data Source Browser, and ODBC Test Tool based -License: GPL v2 or later +License: GPLv2+ Url: http://www.unixodbc.org/ Group: Productivity/Databases/Tools Requires: unixODBC = %{version} @@ -123,25 +123,3 @@ rm -rf "$RPM_BUILD_ROOT" %exclude /usr/include/uodbc_extras.h %changelog -* Mon Oct 13 2008 nadvornik@suse.cz -- dropped the dlopen patch, it no longer matches -* Wed Nov 15 2006 anosek@suse.cz -- fixed compiler warning: variable is used before its value is set - [#218998] (ctracing.patch) -* Wed Oct 18 2006 anosek@suse.cz -- updated to version 2.2.12 - * bugfixes -* Tue Jul 25 2006 mmarek@suse.de -- fix build with modular Xorg -* Thu Jun 15 2006 mmarek@suse.cz -- moved %%{_libdir}/unixODBC/*.so to main package, so that libfoo.so - and libfooS.so can be used in driver configuration. -* Thu Jun 15 2006 mmarek@suse.cz -- updated distributed libltdl to make autoconf happy -- dropped unixODBC-gui-gtk -* Thu Jun 08 2006 mmarek@suse.cz -- reduce BuildRequires -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Jan 20 2006 ro@suse.de -- split specfile for gui packages diff --git a/unixODBC.changes b/unixODBC.changes index 25ad001..aa74512 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 19 13:43:00 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + ------------------------------------------------------------------- Wed Jan 7 12:34:56 CET 2009 - olh@suse.de diff --git a/unixODBC.spec b/unixODBC.spec index 1ee92fd..ef2df25 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ # # spec file for package unixODBC (Version 2.2.12) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,9 +21,9 @@ Name: unixODBC BuildRequires: gcc-c++ Version: 2.2.12 -Release: 120 +Release: 122 Summary: ODBC driver manager with some drivers included -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Url: http://www.unixodbc.org/ Group: Productivity/Databases/Tools AutoReqProv: on @@ -38,6 +38,7 @@ Provides: libodbcinst.so()(64bit), libodbc.so()(64bit) %endif Source: unixODBC-%{version}.tar.bz2 Source1: README.SuSE +Source2: baselibs.conf Patch1: unixODBC-paths.patch Patch4: unixODBC-odbctest.patch Patch5: unixODBC-iaddr.patch @@ -51,7 +52,7 @@ Patch13: %{name}-%{version}-uninitialized.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Includes and Static Libraries for ODBC Development Group: Development/Libraries/C and C++ AutoReqProv: on @@ -167,180 +168,3 @@ 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 -* 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 - * Add missing SQLSetStmtOptionA and SQLSetStmtOptionW - * The config string being passed into ConfigDsn was wrong, - removed semicolon, and added terminating double null - * Add help help to isql - * Alter odbctest FullConnect to use SQLDriverConnect - * Replace a missed flag for true 64 bit operation - * Add ODBC3<->ODBC2 type mapping in SQLSetParam - * Tidy up the search for GUI lib code in SQLManageDatasource - * Fix possible exit from SQLConnect without having closed - in the driver - * Alter args to SQLParamOptions - * Fix bug preventing attribute length from being returned from - SQLDrivers - * Fixed broken iusql -- dropped obsolete unixODBC-2.2.12.patch unixODBC-qt-dirs.patch -* Thu Jun 15 2006 mmarek@suse.cz -- moved %%{_libdir}/unixODBC/*.so to main package, so that libfoo.so - and libfooS.so can be used in driver configuration. -* Thu Jun 15 2006 mmarek@suse.cz -- updated distributed libltdl to make autoconf happy -- dropped unixODBC-gui-gtk -* Mon Mar 27 2006 mmarek@suse.cz -- fixed some uninitialized variables reported by David Binderman - [#160570] (uninitialized.patch) -* Tue Jan 31 2006 mmarek@suse.cz -- fixed txt driver - [#146507] (sqp.patch) -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Jan 20 2006 ro@suse.de -- split gui packages to own specfile -* Tue Jan 17 2006 sbrabec@suse.cz -- Remove unneeded libunicode from neededforbuild. -* Tue Nov 29 2005 mmarek@suse.cz -- fix build with flex-2.5.31 - (flex.patch) -* Tue Nov 01 2005 mmarek@suse.cz -- add libtool and libinilc symbols to odbcinst/odbcinst.exp - (#131175) -- disable unixODBC-2.2.11-dm.patch since it's probably no more - needed -* Thu Oct 20 2005 mmarek@suse.cz -- remove LT_GLOBAL flag from libtool to enable dlopen()ing libodbc.so - (#96312) -- remove headers for compatibility with qt3 (no longer needed) -- added norootforbuild -* Tue Sep 27 2005 mmarek@suse.cz -- compile with --disable-stats to prevent DoS [#118547] -* Mon Sep 19 2005 mmarek@suse.cz -- fix gcc warnings about implicit function declarations -* Wed Apr 27 2005 ltinkl@suse.cz -- updated to 2.2.11 -- fix build with gcc4 -* 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 -* Wed Nov 10 2004 ro@suse.de -- reduced neededforbuild -* Tue Sep 14 2004 ltinkl@suse.cz -- put the .desktop file in the right package (#44790) -* Mon Jul 26 2004 ro@suse.de -- fix some compiler warnings -* Mon Jul 19 2004 ltinkl@suse.cz -- update to 2.2.9 -* Mon May 24 2004 ro@suse.de -- fix some compiler warnings -* Tue Mar 23 2004 ltinkl@suse.cz -- don't package generated files (#36304) -* Thu Feb 26 2004 kukuk@suse.de -- Obsolete libiodbc-devel instead of conflicting with it. -- provide 64bit libodbcinst.so/libobdc.so on all 64bit - architectures. -* Wed Feb 25 2004 schwab@suse.de -- Provide libodbcinst.so()(64bit), libodbc.so()(64bit) on ia64 for - BEAJava2 [#29515]. -* Fri Feb 20 2004 ltinkl@suse.cz -- update to 2.2.8 -* Wed Jan 14 2004 ltinkl@suse.cz -- added patch to fix SQL results -* Wed Dec 03 2003 ltinkl@suse.cz -- update to 2.2.7 -* Fri Sep 05 2003 ltinkl@suse.cz -- fix #29515 -* Mon Sep 01 2003 ltinkl@suse.cz -- created patch unixODBC-odbctest.patch to fix #29639 -* Fri Aug 15 2003 adrian@suse.de -- add desktop file -* Wed Jul 30 2003 ro@suse.de -- fix gODBCconfig configure.in for autoreconf -* Wed Jul 30 2003 ltinkl@suse.de -- update to version 2.2.6 -* 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. -* Mon Jul 14 2003 sbrabec@suse.cz -- Added gnome-filesystem to neededforbuild. -* Mon Jun 23 2003 ro@suse.de -- fix for current automake -* Fri Dec 27 2002 prehak@suse.cz -- temporarily added two header files from Qt which make it build with Qt-3.1.1 - (remove them when they won't be needed to build) -* Tue Nov 19 2002 ro@suse.de -- add AM_GNU_GETTEXT_VERSION -* 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 -* Tue Oct 01 2002 prehak@suse.cz -- updated to version 2.2.3 -- libodbcinstQ.{so,la} moved from unixODBC-devel to unixODBC-gui-qt - [#19743] -* Fri Sep 27 2002 ro@suse.de -- Added alsa alsa-devel to neededforbuild (esound) -* Mon Sep 09 2002 meissner@suse.de -- Use qt3 instead of qt2. -* Sun Aug 18 2002 prehak@suse.cz -- fixed segfaulting isql when using SAPDB driver - (created unixODBC-segfault.dif) -* Mon Aug 12 2002 schwab@suse.de -- Fix configure script. -* Sat Jul 27 2002 adrian@suse.de -- fix neededforbuild -* Tue Jul 09 2002 prehak@suse.de -- updated to version 2.2.2 (mainly bugfixes, some unicode changes) -* Mon Jun 10 2002 prehak@suse.cz -- updated to version 2.2.1 (mainly bugfixes) -- changed group to Productivity/Databases/Tools -- changed path for .ini files to /etc/unixODBC/ - and path for drivers to /usr/lib/unixODBC/ -- removed sample odbcinst.ini (TXT driver is not used so freqvently) -- created patch to apply %%{_lib} macro -- added new configure feature --with-odbc-libs in gODBCConfig -- moved *.so files to devel package -- created README.SuSE -* Thu May 16 2002 ro@suse.de -- use libdir -* Fri Apr 05 2002 ro@suse.de -- build with current autoconf/automake/gettext -* Wed Feb 27 2002 poeml@suse.de -- don't include the (empty anyway) .ini files to the package, to - avoid a file conflict with the libiodbc package. The .ini files - are now packed as %%ghost and touched in %%post in both packages. -- rewrote %%post to not use absolute paths. -* Tue Jan 08 2002 ro@suse.de -- help libtool with RPM_BUILD_ROOT -* Fri Jan 04 2002 poeml@suse.de -- update to 2.1.1 (bugfixes, 64 bit fixes, support for FILEDSN's, - changes to ODBCConfig. See http://www.unixodbc.org/ for the - changelog.) -- add new libodbcinstQ.so* to filelist -- remove libodbccr.so* from filelist (not to be installed) -* Fri Nov 09 2001 ro@suse.de -- use qt-devel-packages in neededforbuild -* Tue Oct 02 2001 rbarn@suse.de -- update to version 2.0.9 -- Fix small bug in postgres driver -* Sun May 13 2001 schwab@suse.de -- Fix missing declarations. -* Wed May 09 2001 poeml@suse.de -- bzip2 sources -* Fri Apr 13 2001 ro@suse.de -- hack for new gettext -* Sun Apr 01 2001 mfrueh@suse.de -- created initial package