From 09b5434ace9bb81134b8adb1f2f065b594e55715 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:50:02 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20unixODB?= =?UTF-8?q?C-2.2.2-1.src.rpm=20Mon=20Jul=2022=202002=20Trond=20Eivind=20Gl?= =?UTF-8?q?omsr=F8d=20=202.2.2-1=20-=202.2.2=20-=20desktop?= =?UTF-8?q?=20file=20changes=20(#=2069371)=20Fri=20Jun=2021=202002=20Tim?= =?UTF-8?q?=20Powers=20=20-=20automated=20rebuild=20Sun?= =?UTF-8?q?=20May=2026=202002=20Tim=20Powers=20=20-=20aut?= =?UTF-8?q?omated=20rebuild=20Mon=20May=2020=202002=20Trond=20Eivind=20Glo?= =?UTF-8?q?msr=F8d=20=202.2.1-1=20-=202.2.1=20-=20Reenable?= =?UTF-8?q?=20other=20archs,=20as=20this=20should=20now=20build=20on=2064?= =?UTF-8?q?=20bit=20archs=20Sun=20May=2019=202002=20Florian=20La=20Roche?= =?UTF-8?q?=20=20-=20add=20at=20least=20mainfra?= =?UTF-8?q?me;=20should=20this=20really=20be=20a=20i386-only=20rpm=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- DataManager.desktop | 3 ++- ODBCConfig.desktop | 5 +++-- sources | 2 +- unixODBC.spec | 32 ++++++++++++++++++++++++-------- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae8fe7b..4f2326c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unixODBC-2.2.0.tar.gz +unixODBC-2.2.2.tar.gz diff --git a/DataManager.desktop b/DataManager.desktop index 5a1d30e..f67217d 100644 --- a/DataManager.desktop +++ b/DataManager.desktop @@ -1,8 +1,9 @@ [Desktop Entry] Name=DataManager -Comment=Application finder +Comment=ODBC Data Source Browsing Tool Exec=DataManager Icon=LinuxODBC.xpm MiniIcon=odbc.xpm Type=Application Terminal=0 +Categories=X-Red-Hat-Extra; diff --git a/ODBCConfig.desktop b/ODBCConfig.desktop index 97c734f..d1bf8fe 100644 --- a/ODBCConfig.desktop +++ b/ODBCConfig.desktop @@ -1,8 +1,9 @@ [Desktop Entry] -Name=ODBCConfig -Comment=Application finder +Name=ODBC Data Source Administrator +Comment=ODBC Data Source Administraton Tool Exec=ODBCConfig Icon=LinuxODBC.xpm MiniIcon=odbc.xpm Type=Application Terminal=0 +Categories=X-Red-Hat-Extra; diff --git a/sources b/sources index 50f90c3..db3db3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef280d18e855b55592a2472679382008 unixODBC-2.2.0.tar.gz +cbd9305c06b315effb970f843df8ac1c unixODBC-2.2.2.tar.gz diff --git a/unixODBC.spec b/unixODBC.spec index 6a3acbc..3054db9 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ Summary: A complete ODBC driver manager for Linux. Name: unixODBC -Version: 2.2.0 -Release: 5a +Version: 2.2.2 +Release: 1 License: LGPL Group: System Environment/Libraries Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz @@ -12,7 +12,6 @@ URL: http://www.unixODBC.org/ Conflicts: iodbc BuildPrereq: kdelibs-devel qt-devel libmng-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root -ExclusiveArch: i386 s390 s390x %description Install unixODBC if you want to access databases through ODBC. This @@ -58,15 +57,15 @@ export QTDIR= . /etc/profile.d/qt.sh rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System +mkdir -p $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons %makeinstall install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} -install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System -install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System +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 +cp DataManager/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/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 > foo-list2 @@ -92,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/ODBCConfig %{_bindir}/DataManager -/etc/X11/applnk/System/* +/usr/share/applications/* %{_libdir}/libodbcinstQ*so %{_libdir}/libodbcinstQ*so.* @@ -105,6 +104,23 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Mon Jul 22 2002 Trond Eivind Glomsrød 2.2.2-1 +- 2.2.2 +- desktop file changes (# 69371) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 20 2002 Trond Eivind Glomsrød 2.2.1-1 +- 2.2.1 +- Reenable other archs, as this should now build on 64 bit archs + +* Sun May 19 2002 Florian La Roche +- add at least mainframe; should this really be a i386-only rpm? + * Wed Apr 17 2002 Bernhard Rosenkraenzer 2.2.0-5 - rebuild