From 8407cf6effb42ae44fc5ad3a4a0b161528bf313b Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Mon, 3 May 2010 17:50:02 +0000
Subject: [PATCH] Re-add accidentally-removed desktop icon for ODBCConfig, and
 remove     no-longer-used DataManager.desktop from CVS.

---
 DataManager.desktop |  9 ---------
 unixODBC.spec       | 12 ++++++++++--
 2 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 DataManager.desktop

diff --git a/DataManager.desktop b/DataManager.desktop
deleted file mode 100644
index dbd15d6..0000000
--- a/DataManager.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=DataManager
-Comment=ODBC Data Source Browsing Tool
-Exec=DataManager
-Icon=LinuxODBC.xpm
-Type=Application
-Encoding=UTF-8
-Terminal=false
-Categories=X-Red-Hat-Extra;
diff --git a/unixODBC.spec b/unixODBC.spec
index ecffdf1..d9d6947 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -107,9 +107,12 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
-# installing *.desktop files
+# install *.desktop files
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
 
+# package doesn't supply an icon for ODBCConfig, so use the one for DataManager
+cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
 case `uname -i` in
@@ -175,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/ODBCConfig
 %{_datadir}/applications/ODBCConfig.desktop
+%{_datadir}/pixmaps/LinuxODBC.xpm
 %{_libdir}/libodbcinstQ*so
 %{_libdir}/libodbcinstQ*so.*
 
@@ -185,6 +189,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon May  3 2010 Tom Lane <tgl@redhat.com> 2.2.14-11
+- Re-add accidentally-removed desktop icon for ODBCConfig
+Related: #587933
+
 * Sat Mar 13 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.2.14-10
 - BR qt-assistant-adp-devel