rpms/google-gadgets/F-11 .cvsignore, 1.8, 1.9 google-gadgets.spec, 1.25, 1.26 sources, 1.8, 1.9

[Michel Alexandre Salim]

Author: salimma

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

Modified Files:
	.cvsignore google-gadgets.spec sources 
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2009 17:53:05 -0000	1.8
+++ .cvsignore	8 May 2010 13:27:55 -0000	1.9
@@ -1 +1 @@
-google-gadgets-for-linux-0.11.1.tar.bz2
+google-gadgets-for-linux-0.11.2.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- google-gadgets.spec	30 Mar 2010 13:54:07 -0000	1.25
+++ google-gadgets.spec	8 May 2010 13:27:55 -0000	1.26
@@ -2,9 +2,9 @@
 #define alphatag 20090430svn%{svnrev}
 
 Name:           google-gadgets
-Version:        0.11.1
+Version:        0.11.2
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        6%{?dist}
+Release:        2%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -19,7 +19,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  libcurl-devel libxml2-devel zlib-devel libtool-ltdl-devel
 # still needed even if we're not buliding gtkmoz element, for JavaScript
-BuildRequires:  xulrunner-devel-unstable
+BuildRequires:  gecko-devel-unstable
 BuildRequires:  dbus-devel gstreamer-devel gstreamer-plugins-base-devel
 BuildRequires:  cairo-devel gtk2-devel librsvg2-devel
 BuildRequires:  qt4-devel WebKit-qt-devel zip
@@ -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,27 +208,16 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Tue Mar 30 2010 Jan Horak <jhorak at redhat.com> - 0.11.1-6
-- Rebuild against newer gecko
-
-* Thu Feb 18 2010 jhorak at redhat.com - 0.11.1-5
-- Rebuild against newer gecko
+* 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
 
-* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-4
-- Rebuild against newer gecko
-
-* Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-3
-- Rebuild against newer gecko
-
-* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-2
-- Rebuild against newer gecko
+* Tue Mar 30 2010 Michel Salim <salimma at fedoraproject.org> - 0.11.2-1
+- Update to 0.11.2
 
 * Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
 - Update to 0.11.1
 
-* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.11.0-5
-- Rebuild against newer gecko
-
 * Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
 - Backport Gecko version detection fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 17:53:06 -0000	1.8
+++ sources	8 May 2010 13:27:55 -0000	1.9
@@ -1 +1 @@
-62fec129694e83d0de481667e3c785d8  google-gadgets-for-linux-0.11.1.tar.bz2
+279305553bcbf74f3e3615f6abc36a5e  google-gadgets-for-linux-0.11.2.tar.bz2