rpms/unixODBC
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-add accidentally-removed desktop icon for ODBCConfig, and remove

Browse Source 
no-longer-used DataManager.desktop from CVS.
This commit is contained in:
Tom Lane 2010-05-03 17:50:02 +00:00
parent c2c56fc764
commit 8407cf6eff
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataManager.desktop
View File

@ -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;

12
unixODBC.spec
View File

@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux Summary: A complete ODBC driver manager for Linux
Name: unixODBC Name: unixODBC
Version: 2.2.14 Version: 2.2.14
Release: 10%{?dist} Release: 11%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.unixODBC.org/ URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL. # 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 make DESTDIR=$RPM_BUILD_ROOT install
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
# installing *.desktop files # install *.desktop files
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2} 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 # multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335 # we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in case `uname -i` in
@ -175,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/ODBCConfig %{_bindir}/ODBCConfig
%{_datadir}/applications/ODBCConfig.desktop %{_datadir}/applications/ODBCConfig.desktop
%{_datadir}/pixmaps/LinuxODBC.xpm
%{_libdir}/libodbcinstQ*so %{_libdir}/libodbcinstQ*so
%{_libdir}/libodbcinstQ*so.* %{_libdir}/libodbcinstQ*so.*
@ -185,6 +189,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %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 * Sat Mar 13 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.2.14-10
- BR qt-assistant-adp-devel - BR qt-assistant-adp-devel