Install icons in /usr/share/pixmaps, not /usr/share/icons
This commit is contained in:
parent
6052acb3b0
commit
66ee88be19
@ -1,7 +1,7 @@
|
||||
Summary: A complete ODBC driver manager for Linux
|
||||
Name: unixODBC
|
||||
Version: 2.2.12
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.unixODBC.org/
|
||||
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
|
||||
@ -101,17 +101,16 @@ 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
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
|
||||
%makeinstall
|
||||
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
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
|
||||
cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
cp DataManager/ODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/odbc.xpm
|
||||
cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/odbc.xpm
|
||||
|
||||
# copy text driver documentation into main doc directory
|
||||
mkdir -p doc/Drivers/txt
|
||||
@ -163,8 +162,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/odbctest
|
||||
/usr/share/applications/ODBCConfig.desktop
|
||||
/usr/share/applications/DataManager.desktop
|
||||
/usr/share/icons/LinuxODBC.xpm
|
||||
/usr/share/icons/odbc.xpm
|
||||
/usr/share/pixmaps/LinuxODBC.xpm
|
||||
/usr/share/pixmaps/odbc.xpm
|
||||
%{_libdir}/libodbcinstQ*so
|
||||
%{_libdir}/libodbcinstQ*so.*
|
||||
|
||||
@ -175,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Jun 13 2008 Tom Lane <tgl@redhat.com> 2.2.12-8
|
||||
- Install icons in /usr/share/pixmaps, not /usr/share/icons as this package
|
||||
has historically done; the former is considered correct.
|
||||
|
||||
* Fri Apr 4 2008 Tom Lane <tgl@redhat.com> 2.2.12-7
|
||||
- Must BuildRequire qt3 now that Fedora has renamed qt4 to qt
|
||||
Resolves: #440798
|
||||
|
Loading…
Reference in New Issue
Block a user