rpms/gnochm/devel gnochm.spec,1.7,1.8

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	gnochm.spec 
Log Message:
* Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-4
- put icon file in %{_datadir}/icons/hicolor/
- remove Requires() desktop-file-utils according to the new guidelines



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnochm.spec	12 Sep 2006 21:28:00 -0000	1.7
+++ gnochm.spec	24 Sep 2006 11:39:20 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -23,8 +23,6 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -59,6 +57,8 @@
         --add-category X-Fedora                                 \
         --delete-original                                       \
         $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnochm.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 
 %find_lang %{name}
 
@@ -88,6 +88,10 @@
 
 update-desktop-database &> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -103,6 +107,10 @@
 
 update-desktop-database &> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -118,9 +126,14 @@
 %{_datadir}/mime-info/gnochm.*
 %{_datadir}/omf/gnochm/
 %{_datadir}/pixmaps/chmfile.png
-%{_datadir}/pixmaps/gnochm*.png
+%{_datadir}/pixmaps/gnochm_logo.png
+%{_datadir}/icons/hicolor/
 
 %changelog
+* Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-4
+- put icon file in %%{_datadir}/icons/hicolor/
+- remove Requires() desktop-file-utils according to the new guidelines
+
 * Tue Sep 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-3
 - BuildRequires perl(XML::Parser) required by the internal intltool