packages: google-chrome/google-chrome.spec - default app support included i...

[glen]

Author: glen                         Date: Tue Mar  9 21:46:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- default app support included in gnome-control-center-2.28.1-3

---- Files affected:
packages/google-chrome:
   google-chrome.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.11 packages/google-chrome/google-chrome.spec:1.12
--- packages/google-chrome/google-chrome.spec:1.11	Mon Feb 15 17:58:48 2010
+++ packages/google-chrome/google-chrome.spec	Tue Mar  9 22:46:10 2010
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - install default-apps/google-chrome.xml to
-#   /usr/share/gnome-control-center/default-apps, somehow, try avoid pulling
-#   whole gnome desktop (trigger or include in gnome-control-center.spec)
 %define		buildid	34537
 %define		rel		1
 Summary:	Google Chrome
@@ -82,6 +78,9 @@
 mv chrome/google-chrome .
 chmod a+x chrome/lib*.so*
 
+# included in gnome-control-center-2.28.1-3
+rm default-app-block default-apps/google-chrome.xml
+
 %ifarch %{x8664}
 # go figure, 32bit one doesn't have it compressed
 gzip -d *.1.gz
@@ -90,8 +89,6 @@
 %patch0 -p1
 
 %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
-%{__sed} -i 's;/opt/google/chrome/google-chrome;%{_libdir}/%{name}/chrome;' default-app-block
-%{__sed} -i 's;/opt/google/chrome/google-chrome;%{_libdir}/%{name}/chrome;' default-apps/google-chrome.xml
 %{__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
 
@@ -174,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/03/09 21:46:10  glen
+- default app support included in gnome-control-center-2.28.1-3
+
 Revision 1.11  2010/02/15 16:58:48  uzsolt
 - hungarizing
 
================================================================

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