rpms/comix/devel comix.spec,1.9,1.10

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	comix.spec 
Log Message:
* Wed Dec  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.4-3
- Fix icon path in desktop file for desktop-file-utils 0.14+



Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- comix.spec	20 Aug 2007 11:42:14 -0000	1.9
+++ comix.spec	4 Dec 2007 16:36:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		comix
 Version:	3.6.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
@@ -46,6 +46,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__python} install.py --installdir $RPM_BUILD_ROOT%{_prefix} install
 
+%{__sed} -i -e 's|comix.png|comix|' \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install \
 	--vendor fedora \
 	--delete-original \
@@ -72,40 +74,43 @@
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	
 gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null
 
 # If the schema file has ever been renamed::
 # gconftool-2 --makefile-uninstall-rule \
-# 	%{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-
-killall -HUP gconfd-2 || :
+# 	%{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null
+exit 0
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
+
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null
 
-update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
+exit 0
 
 %preun
 [ "$1" -eq 0 ] || exit 0
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
+
+exit 0
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null
 
-update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
+exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -127,6 +132,9 @@
 
 
 %changelog
+* Wed Dec  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.4-3
+- Fix icon path in desktop file for desktop-file-utils 0.14+
+
 * Mon Aug 20 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.4-2
 - Now %%_sysconfdir/gconf{,/schemas} are owned by GConf2 (#233756)