diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..03fca74 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,3 @@ +unixODBC +unixODBC-devel + requires "unixODBC- = " diff --git a/unixODBC-gui-qt.spec b/unixODBC-gui-qt.spec index 17f0a47..e360605 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) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,16 +10,17 @@ # norootforbuild + Name: unixODBC-gui-qt BuildRequires: qt3-devel Version: 2.2.12 -Release: 48 +Release: 140 Summary: ODBC Configuration Utility, Data Source Browser, and ODBC Test Tool based -License: GNU General Public License (GPL) -URL: http://www.unixodbc.org/ +License: GPL v2 or later +Url: http://www.unixodbc.org/ Group: Productivity/Databases/Tools Requires: unixODBC = %{version} -Autoreqprov: on +AutoReqProv: on Source: unixODBC-%{version}.tar.bz2 Source1: README.SuSE Patch1: unixODBC-paths.patch @@ -76,7 +77,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fn --x-libraries=`pkg-config --variable libdir x11` \ --x-includes=`pkg-config --variable includedir x11` \ --disable-stats - make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %install @@ -120,23 +120,23 @@ rm -rf "$RPM_BUILD_ROOT" %exclude /usr/include/uodbc_extras.h %changelog -* Wed Nov 15 2006 - anosek@suse.cz +* 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 +* Wed Oct 18 2006 anosek@suse.cz - updated to version 2.2.12 * bugfixes -* Tue Jul 25 2006 - mmarek@suse.de +* Tue Jul 25 2006 mmarek@suse.de - fix build with modular Xorg -* Thu Jun 15 2006 - mmarek@suse.cz +* 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 +* 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 +* Thu Jun 08 2006 mmarek@suse.cz - reduce BuildRequires -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - ro@suse.de +* Fri Jan 20 2006 ro@suse.de - split specfile for gui packages diff --git a/unixODBC.changes b/unixODBC.changes index 3768713..ba7a637 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + ------------------------------------------------------------------- Sat May 26 00:34:29 CEST 2007 - dmueller@suse.de diff --git a/unixODBC.spec b/unixODBC.spec index 6cab564..c222232 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ # # spec file for package unixODBC (Version 2.2.12) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,15 +10,16 @@ # norootforbuild + Name: unixODBC BuildRequires: gcc-c++ Version: 2.2.12 -Release: 31 +Release: 84 Summary: ODBC driver manager with some drivers included -License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -URL: http://www.unixodbc.org/ +License: GPL v2 or later; LGPL v2.1 or later +Url: http://www.unixodbc.org/ Group: Productivity/Databases/Tools -Autoreqprov: on +AutoReqProv: on Provides: libodbcinst.so, libodbc.so %ifarch ia64 x86_64 s390x ppc64 Provides: libodbcinst.so()(64bit), libodbc.so()(64bit) @@ -38,10 +39,12 @@ Patch11: %{name}-%{version}-flex.patch Patch12: %{name}-%{version}-sqp.patch Patch13: %{name}-%{version}-uninitialized.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build + %package devel +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 +AutoReqProv: on Obsoletes: libiodbc-devel Requires: %{name} = %{version} @@ -56,7 +59,6 @@ Authors: Peter Harvey Nick Gorham - %description devel Includes and static libraries for ODBC development (based on unixODBC). @@ -96,7 +98,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fn --sysconfdir=%{_sysconfdir}/%{name} \ --enable-gui=no \ --disable-stats - make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %install @@ -153,9 +154,12 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/unixODBC/*.la %changelog -* Sat May 26 2007 - dmueller@suse.de +* 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 - add missing ldconfig fall to %%post/un -* Wed Oct 18 2006 - anosek@suse.cz +* 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, @@ -172,118 +176,118 @@ rm -rf "$RPM_BUILD_ROOT" SQLDrivers * Fixed broken iusql - dropped obsolete unixODBC-2.2.12.patch unixODBC-qt-dirs.patch -* Thu Jun 15 2006 - mmarek@suse.cz +* 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 +* 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 +* 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 +* Tue Jan 31 2006 mmarek@suse.cz - fixed txt driver [#146507] (sqp.patch) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - ro@suse.de +* Fri Jan 20 2006 ro@suse.de - split gui packages to own specfile -* Tue Jan 17 2006 - sbrabec@suse.cz +* Tue Jan 17 2006 sbrabec@suse.cz - Remove unneeded libunicode from neededforbuild. -* Tue Nov 29 2005 - mmarek@suse.cz +* Tue Nov 29 2005 mmarek@suse.cz - fix build with flex-2.5.31 (flex.patch) -* Tue Nov 01 2005 - mmarek@suse.cz +* 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 +* 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 +* Tue Sep 27 2005 mmarek@suse.cz - compile with --disable-stats to prevent DoS [#118547] -* Mon Sep 19 2005 - mmarek@suse.cz +* Mon Sep 19 2005 mmarek@suse.cz - fix gcc warnings about implicit function declarations -* Wed Apr 27 2005 - ltinkl@suse.cz +* Wed Apr 27 2005 ltinkl@suse.cz - updated to 2.2.11 - fix build with gcc4 -* Tue Apr 12 2005 - ro@suse.de +* Wed Apr 13 2005 ro@suse.de - added audiofile-devel to neededforbuild -* Fri Feb 11 2005 - ltinkl@suse.cz +* Fri Feb 11 2005 ltinkl@suse.cz - update to 2.2.10, adapt patches -* Wed Nov 10 2004 - ro@suse.de +* Wed Nov 10 2004 ro@suse.de - reduced neededforbuild -* Tue Sep 14 2004 - ltinkl@suse.cz +* Tue Sep 14 2004 ltinkl@suse.cz - put the .desktop file in the right package (#44790) -* Tue Jul 27 2004 - ro@suse.de +* Tue Jul 27 2004 ro@suse.de - fix some compiler warnings -* Mon Jul 19 2004 - ltinkl@suse.cz +* Mon Jul 19 2004 ltinkl@suse.cz - update to 2.2.9 -* Mon May 24 2004 - ro@suse.de +* Mon May 24 2004 ro@suse.de - fix some compiler warnings -* Tue Mar 23 2004 - ltinkl@suse.cz +* Tue Mar 23 2004 ltinkl@suse.cz - don't package generated files (#36304) -* Thu Feb 26 2004 - kukuk@suse.de +* 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 +* 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 +* Fri Feb 20 2004 ltinkl@suse.cz - update to 2.2.8 -* Wed Jan 14 2004 - ltinkl@suse.cz +* Wed Jan 14 2004 ltinkl@suse.cz - added patch to fix SQL results -* Wed Dec 03 2003 - ltinkl@suse.cz +* Wed Dec 03 2003 ltinkl@suse.cz - update to 2.2.7 -* Fri Sep 05 2003 - ltinkl@suse.cz +* Fri Sep 05 2003 ltinkl@suse.cz - fix #29515 -* Mon Sep 01 2003 - ltinkl@suse.cz +* Mon Sep 01 2003 ltinkl@suse.cz - created patch unixODBC-odbctest.patch to fix #29639 -* Fri Aug 15 2003 - adrian@suse.de +* Fri Aug 15 2003 adrian@suse.de - add desktop file -* Wed Jul 30 2003 - ro@suse.de +* Wed Jul 30 2003 ro@suse.de - fix gODBCconfig configure.in for autoreconf -* Wed Jul 30 2003 - ltinkl@suse.de +* Wed Jul 30 2003 ltinkl@suse.de - update to version 2.2.6 -* Tue Jul 29 2003 - ro@suse.de +* Wed Jul 30 2003 ro@suse.de - remove traces of buildroot from installed files -* Fri Jul 18 2003 - sbrabec@suse.cz +* Fri Jul 18 2003 sbrabec@suse.cz - GNOME prefix change to /opt/gnome. -* Mon Jul 14 2003 - sbrabec@suse.cz +* Mon Jul 14 2003 sbrabec@suse.cz - Added gnome-filesystem to neededforbuild. -* Mon Jun 23 2003 - ro@suse.de +* Mon Jun 23 2003 ro@suse.de - fix for current automake -* Fri Dec 27 2002 - prehak@suse.cz +* 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 +* Tue Nov 19 2002 ro@suse.de - add AM_GNU_GETTEXT_VERSION -* Sun Nov 17 2002 - prehak@suse.cz +* Mon Nov 18 2002 prehak@suse.cz - fixed to build with autoconf 2.56 -* Tue Nov 12 2002 - tcrhak@suse.cz +* Tue Nov 12 2002 tcrhak@suse.cz - fixed for bison 1.75: end rules with semicolons -* Tue Oct 01 2002 - prehak@suse.cz +* 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 +* Fri Sep 27 2002 ro@suse.de - Added alsa alsa-devel to neededforbuild (esound) -* Mon Sep 09 2002 - meissner@suse.de +* Mon Sep 09 2002 meissner@suse.de - Use qt3 instead of qt2. -* Sun Aug 18 2002 - prehak@suse.cz +* 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 +* Mon Aug 12 2002 schwab@suse.de - Fix configure script. -* Sat Jul 27 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild -* Tue Jul 09 2002 - prehak@suse.de +* 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 +* 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/ @@ -293,33 +297,33 @@ rm -rf "$RPM_BUILD_ROOT" - 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 +* Thu May 16 2002 ro@suse.de - use libdir -* Fri Apr 05 2002 - ro@suse.de +* Fri Apr 05 2002 ro@suse.de - build with current autoconf/automake/gettext -* Wed Feb 27 2002 - poeml@suse.de +* 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 +* Tue Jan 08 2002 ro@suse.de - help libtool with RPM_BUILD_ROOT -* Fri Jan 04 2002 - poeml@suse.de +* 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 +* Fri Nov 09 2001 ro@suse.de - use qt-devel-packages in neededforbuild -* Tue Oct 02 2001 - rbarn@suse.de +* 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 +* Sun May 13 2001 schwab@suse.de - Fix missing declarations. -* Wed May 09 2001 - poeml@suse.de +* Wed May 09 2001 poeml@suse.de - bzip2 sources -* Fri Apr 13 2001 - ro@suse.de +* Fri Apr 13 2001 ro@suse.de - hack for new gettext -* Sun Apr 01 2001 - mfrueh@suse.de +* Sun Apr 01 2001 mfrueh@suse.de - created initial package