rpms/qascade/devel qascade.spec,1.6,1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/qascade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23355/devel

Modified Files:
	qascade.spec 
Log Message:
* Thu Nov  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1-4
- Clean up build dependencies.
- Drop workaround for #150528.
- Install icon to %{_datadir}/icons/hicolor, update GTK icon cache.



Index: qascade.spec
===================================================================
RCS file: /cvs/extras/rpms/qascade/devel/qascade.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qascade.spec	18 Mar 2005 16:36:14 -0000	1.6
+++ qascade.spec	10 Nov 2005 08:01:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           qascade
 Version:        0.1
-Release:        3
+Release:        4%{?dist}
 Summary:        Classic puzzle game
 
 Group:          Amusements/Games
@@ -11,7 +11,8 @@
 Patch0:         %{name}-dblsep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel, XFree86-devel, desktop-file-utils
+BuildRequires:  qt-devel
+BuildRequires:  desktop-file-utils
 
 %description
 Qascade is a port of the simple yet addictive and enjoyable puzzle
@@ -27,7 +28,6 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake INSTALL_ROOT=$RPM_BUILD_ROOT qascade.pro
 perl -pi -e 's|^(C(XX)?FLAGS\s*=.*)$|$1 \$(RPM_OPT_FLAGS)|g' Makefile
-perl -pi -e 's|^(UIC\s*=.*)|$1 -nounload|' Makefile # work around #150528
 make %{?_smp_mflags}
 
 
@@ -43,23 +43,36 @@
   %{SOURCE1}
 install -D -p -m 644 %{name}.hscr \
   $RPM_BUILD_ROOT%{_localstatedir}/lib/games/%{name}.hscr
-install -D -p -m 644 blue.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 blue.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/qascade.png
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc *.htm
 %attr(2755,root,games) %{_bindir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/qascade.png
 %attr(0664,games,games) %config(noreplace) %{_localstatedir}/lib/games/%{name}*
 
 
 %changelog
+* Thu Nov  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1-4
+- Clean up build dependencies.
+- Drop workaround for #150528.
+- Install icon to %%{_datadir}/icons/hicolor, update GTK icon cache.
+
 * Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1-3
 - Add workaround for UIC segfault (#150528).
 - Various cosmetic desktop entry and UI tweaks.