diff --git a/.cvsignore b/.cvsignore index 2702c71..c54a090 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unixODBC-2.2.3.tar.gz +unixODBC-2.2.5-rh.tar.gz diff --git a/odbcinst.ini b/odbcinst.ini index 6962e5c..6972214 100644 --- a/odbcinst.ini +++ b/odbcinst.ini @@ -10,8 +10,10 @@ Setup = /usr/lib/libodbcpsqlS.so FileUsage = 1 -# From the MyODBC package +# Driver from the MyODBC package +# Setup from the unixODBC package #[MySQL] #Description = ODBC for MySQL #Driver = /usr/lib/libmyodbc.so +#Setup = /usr/lib/libodbcmyS.so #FileUsage = 1 diff --git a/sources b/sources index 6e35786..78fb86b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98837a5e0642d8e1807e748b381e4153 unixODBC-2.2.3.tar.gz +16c0c149776c17479f6a0ed3296fd6a5 unixODBC-2.2.5-rh.tar.gz diff --git a/unixODBC.spec b/unixODBC.spec index 610aae2..f331f7c 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,18 +1,17 @@ Summary: A complete ODBC driver manager for Linux. Name: unixODBC -Version: 2.2.3 -Release: 6 +Version: 2.2.5 +Release: 9 License: LGPL Group: System Environment/Libraries -Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz +Source: http://www.unixODBC.org/%{name}-%{version}-rh.tar.gz Source1: odbcinst.ini Source2: ODBCConfig.desktop Source3: DataManager.desktop -Patch: unixODBC-typo.patch URL: http://www.unixODBC.org/ Conflicts: iodbc -BuildPrereq: kdelibs-devel qt-devel libmng-devel -BuildRequires: autoconf213 automake14 libtool +#ExcludeArch:x86_64 ppc64 s390x +BuildPrereq: kdelibs-devel qt-devel libmng-devel automake autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -34,7 +33,7 @@ ODBC, you need to install this package. %package kde Summary: KDE driver manager components for ODBC. Group: System Environment/Libraries -requires: qt >= 2.1 +Requires: qt >= 2.1 %description kde This package contains components for the ODBCConfig and DataManager @@ -42,11 +41,6 @@ This package contains components for the ODBCConfig and DataManager %prep %setup -q -%patch -p1 -libtoolize --force -aclocal-1.4 -automake-1.4 -autoconf-2.13 %build # pick up qt path @@ -55,6 +49,9 @@ export QTDIR= # clean up old moc files (cd ODBCConfig && rm -f mclass*.cpp) (cd DataManager && rm -f mclass*.cpp) +aclocal +automake +autoconf %configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-static=yes --enable-drivers make all @@ -65,6 +62,7 @@ export QTDIR= rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/share/applications +mkdir -p $RPM_BUILD_ROOT/usr/share/icons mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons %makeinstall @@ -73,16 +71,19 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications install -m644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons cp DataManager/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons/odbc.xpm +cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT/usr/share/icons +cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT/usr/share/icons/odbc.xpm find $RPM_BUILD_ROOT/%{_libdir} -name "*.so.*" |sed "s|$RPM_BUILD_ROOT||" |grep -i -v libodbcinstQ > foo-list -find $RPM_BUILD_ROOT/%{_libdir} -name "*.so" |sed "s|$RPM_BUILD_ROOT||" |grep -i -v libodbcinstQ |grep -v -E "libodbc.so$" > foo-list2 +find $RPM_BUILD_ROOT/%{_libdir} -name "*.so" |sed "s|$RPM_BUILD_ROOT||" |grep -i -v libodbcinstQ |grep -v -E "libodbc.so$" |grep -v -E "libodbcpsqlS?.so$" |grep -v -E "libodbcmyS.so$" > foo-list2 # move to main package, it's often dlopened... echo "%{_libdir}/libodbc.so" >> foo-list +echo "%{_libdir}/libodbcpsql.so" >> foo-list +echo "%{_libdir}/libodbcpsqlS.so" >> foo-list +echo "%{_libdir}/libodbcmyS.so" >> foo-list # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/{DataManager.desktop,ODBCConfig.desktop} -rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/{LinuxODBC.xpm,odbc.xpm} %clean rm -rf $RPM_BUILD_ROOT @@ -96,9 +97,11 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/isql %{_bindir}/dltest %{_bindir}/iusql -%{_bindir}/odbctest +#%{_bindir}/odbctest +#{_libdir}/libodbcinstQ* + %files devel -f foo-list2 %defattr(-,root,root) %{_includedir}/* @@ -109,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ODBCConfig %{_bindir}/DataManager %{_bindir}/DataManagerII +%{_bindir}/odbctest +/usr/share/applications/ODBCConfig.desktop +/usr/share/applications/DataManager.desktop +/usr/share/icons/LinuxODBC.xpm +/usr/share/icons/odbc.xpm %{_libdir}/libodbcinstQ*so %{_libdir}/libodbcinstQ*so.* @@ -121,6 +129,54 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add comments to the /etc/odbcinst.ini file regarding the proper + setup for MySQL and the origin of each library needed. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-8 +- Move libodbcmyS.so to the main package as well. It is used the + same way as libodbcpsqlS.so. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-7 +- Bumped the version so it rebuilds. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-4 +- Revert previous change and special case libodbcpsql.so and + libodbcpsqlS.so instead. Here is the explanation (from Elliot + Lee): + ".so files are only used at link time for normal dynamic libraries. + The libraries referred to here are being used as dynamically loaded + modules, so I guess moving those particular .so files back to the + main package would make sense, but the other .so files should stay + in the devel subpackage." + +* Fri Oct 10 2003 Fernando Nasser 2.2.5-3 +- Moved all the shared library symlinks to the main package. + They were deliberatedly being added to the devel package for + unknown reasons but this was forcing users to install the + devel package always. +- No need to special-case libodbc.so anymore + +* Fri Sep 05 2003 Elliot Lee 2.2.5-2 +- Run auto* so it rebuilds. + +* Mon Jul 07 2003 Fernando Nasser 2.2.5-1 +- Moved odbctest to the kde package to remove require on Qt stuff + from the main package. +- Removed stray "\" from doc/Makefile.am +- Applied libtool fix (provided by Alex Oliva) so that it build + with cross-compilers (which are used by 64 bit systems) +- Updated sources to the 2.2.5 community release +- Changed the included libtool to the 1.5-3 one so that + it properly link the libraries with the newly generated ones + and not with the ones installed on the build system (or give + an error if an old version is not installed (# 91110) +- Added new files for executable DataManagerII and icons LinuxODBC.xpm + and odbc.xpm + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + * Wed Jan 22 2003 Tim Powers - rebuilt