rpms/google-gadgets/devel google-gadgets.spec,1.18,1.19

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26208/devel

Modified Files:
	google-gadgets.spec 
Log Message:
* Sat May  8 2010 Michel Salim <salimma at fedoraproject.org> - 0.11.2-2
- Remove invalid MIME entry from desktop files
- Update icon cache scriptlets



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- google-gadgets.spec	9 Apr 2010 23:54:37 -0000	1.18
+++ google-gadgets.spec	8 May 2010 13:27:55 -0000	1.19
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.2
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -78,7 +78,11 @@ developing applications that use %{name}
 %setup -q -n %{name}-for-linux-%{version}
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
-
+# Fix invalid desktop file MIME type
+# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=360
+for f in hosts/*/ggl-*.desktop.in; do
+    sed -i 's|;app/gg;|;|' $f
+done
 
 
 %build
@@ -135,18 +139,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %post gtk
 /sbin/ldconfig
 update-desktop-database &> /dev/null || :
@@ -204,6 +208,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat May  8 2010 Michel Salim <salimma at fedoraproject.org> - 0.11.2-2
+- Remove invalid MIME entry from desktop files
+- Update icon cache scriptlets
+
 * Tue Mar 30 2010 Michel Salim <salimma at fedoraproject.org> - 0.11.2-1
 - Update to 0.11.2