packages: google-chrome/google-chrome.spec, google-chrome/chrome-desktop.pa...

[glen]

Author: glen                         Date: Sun Dec 13 12:53:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- w3c notes application/xhtml+xml not application/xhtml_xml

---- Files affected:
packages/google-chrome:
   google-chrome.spec (1.4 -> 1.5) , chrome-desktop.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.4 packages/google-chrome/google-chrome.spec:1.5
--- packages/google-chrome/google-chrome.spec:1.4	Sun Dec 13 13:18:32 2009
+++ packages/google-chrome/google-chrome.spec	Sun Dec 13 13:53:24 2009
@@ -13,6 +13,7 @@
 # Source1-md5:	242f9b0bca48628544205b69230be422
 Source2:	%{name}.sh
 Source4:	find-lang.sh
+Patch0:	chrome-desktop.patch
 URL:		http://chrome.google.com/
 BuildRequires:	rpm-utils
 BuildRequires:	rpmbuild(macros) >= 1.453
@@ -74,9 +75,11 @@
 gzip -d *.1.gz
 %endif
 
+%patch0 -p1
+
 %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
 %{__sed} -i 's;/opt/google/chrome/google-chrome;%{_libdir}/%{name}/chrome;' chrome/default-app-block
-%{__sed} -i 's;/opt/google/chrome/product_logo_48.png;%{_pixmapsdir}/%{name}.png;' google-chrome.desktop
+%{__sed} -i 's;/opt/google/chrome/product_logo_48.png;%{name}.png;' google-chrome.desktop
 %{__sed} -i 's;/opt/google/chrome;%{_bindir};' google-chrome.desktop
 
 %install
@@ -157,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2009/12/13 12:53:24  glen
+- w3c notes application/xhtml+xml not application/xhtml_xml
+
 Revision 1.4  2009/12/13 12:18:32  glen
 - fix chrome bin path in default-app-block
 

================================================================
Index: packages/google-chrome/chrome-desktop.patch
diff -u /dev/null packages/google-chrome/chrome-desktop.patch:1.1
--- /dev/null	Sun Dec 13 13:53:29 2009
+++ packages/google-chrome/chrome-desktop.patch	Sun Dec 13 13:53:24 2009
@@ -0,0 +1,8 @@
+--- google-chrome-4.0.249.30/google-chrome.desktop~	2009-12-13 14:15:20.000000000 +0200
++++ google-chrome-4.0.249.30/google-chrome.desktop	2009-12-13 14:19:58.082677897 +0200
+@@ -111,4 +111,4 @@
+ Icon=/usr/share/pixmaps/google-chrome.png
+ Type=Application
+ Categories=Application;Network;WebBrowser;
+-MimeType=text/html;text/xml;application/xhtml_xml;
++MimeType=text/html;text/xml;application/xhtml+xml;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-chrome/google-chrome.spec?r1=1.4&r2=1.5&f=u