rpms/xchm/devel xchm.desktop,1.1,1.2 xchm.spec,1.3,1.4

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	xchm.desktop xchm.spec 
Log Message:
* Sat Sep 23 2006 Patrice Dumas <pertusus at free.fr> 1.9-3
- install icons in %{_datadir}/icons/ instead of %{_datadir}/pixmaps/
  fix #207759



Index: xchm.desktop
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xchm.desktop	21 Jul 2006 11:18:43 -0000	1.1
+++ xchm.desktop	22 Sep 2006 23:13:57 -0000	1.2
@@ -7,7 +7,7 @@
 Comment=wxGTK based GUI front-end to chmlib
 Comment[fr]=Une interface pour chmlib utilisant wxGTK
 Exec=xchm
-Icon=xchm-16.xpm
+Icon=xchm
 Terminal=false
 Type=Application
 Categories=Application;Utility;


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xchm.spec	12 Sep 2006 17:07:49 -0000	1.3
+++ xchm.spec	22 Sep 2006 23:13:57 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
 Version:        1.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Publishing
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
@@ -36,19 +36,38 @@
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         %{SOURCE1}
+for resolution in 16 32 48 128; do
+  dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/apps/
+  mkdir -p $dir
+  install -p -m644 art/xchm-${resolution}.xpm $dir/xchm.xpm
+done
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+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 ChangeLog README
 %{_bindir}/xchm
-%{_datadir}/pixmaps/*.xpm
+#%{_datadir}/pixmaps/*.xpm
+%{_datadir}/icons/hicolor/
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 23 2006 Patrice Dumas <pertusus at free.fr> 1.9-3
+- install icons in %%{_datadir}/icons/ instead of %%{_datadir}/pixmaps/
+  fix #207759
+
 * Tue Sep 12 2006 Patrice Dumas <pertusus at free.fr> 1.9-2
 - rebuild for FC6