diff --git a/.cvsignore b/.cvsignore index 4f2326c..2702c71 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unixODBC-2.2.2.tar.gz +unixODBC-2.2.3.tar.gz diff --git a/sources b/sources index db3db3a..6e35786 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbd9305c06b315effb970f843df8ac1c unixODBC-2.2.2.tar.gz +98837a5e0642d8e1807e748b381e4153 unixODBC-2.2.3.tar.gz diff --git a/unixODBC.spec b/unixODBC.spec index b785ec3..1dfee5e 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,13 +1,14 @@ Summary: A complete ODBC driver manager for Linux. Name: unixODBC -Version: 2.2.2 -Release: 3 +Version: 2.2.3 +Release: 2 License: LGPL Group: System Environment/Libraries Source: http://www.unixODBC.org/%{name}-%{version}.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 @@ -40,6 +41,7 @@ This package contains components for the ODBCConfig and DataManager %prep %setup -q +%patch -p1 %build # pick up qt path @@ -72,6 +74,11 @@ find $RPM_BUILD_ROOT/%{_libdir} -name "*.so" |sed "s|$RPM_BUILD_ROOT||" |grep - # move to main package, it's often dlopened... echo "%{_libdir}/libodbc.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 @@ -98,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/ODBCConfig %{_bindir}/DataManager -/usr/share/applications/* +%{_bindir}/DataManagerII %{_libdir}/libodbcinstQ*so %{_libdir}/libodbcinstQ*so.* @@ -111,6 +118,12 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Fri Nov 29 2002 Tim Powers 2.2.3-2 +- remove unpackaged files from the buildroot + +* Tue Nov 19 2002 Elliot Lee 2.2.3-1 +- Rebuild, update to 2.2.3 + * Mon Aug 26 2002 Trond Eivind Glomsrød 2.2.2-3 - Move libodbc.so to the main package, so programs dlopening it don't break (#72653)