packages: chromium-browser-bin/chromium-browser-bin.spec - system xdg-utils...

[glen]

Author: glen                         Date: Wed Sep  7 21:47:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- system xdg-utils is fine, use it

---- Files affected:
packages/chromium-browser-bin:
   chromium-browser-bin.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/chromium-browser-bin/chromium-browser-bin.spec
diff -u packages/chromium-browser-bin/chromium-browser-bin.spec:1.43 packages/chromium-browser-bin/chromium-browser-bin.spec:1.44
--- packages/chromium-browser-bin/chromium-browser-bin.spec:1.43	Tue Aug  2 13:12:55 2011
+++ packages/chromium-browser-bin/chromium-browser-bin.spec	Wed Sep  7 23:47:24 2011
@@ -1,19 +1,19 @@
 # $Revision$, $Date$
 # NOTES:
 # - to look for new tarball, use update-source.sh script
-%define		svnrev	95033
+%define		svnrev	99948
 %define		rel		1
 Summary:	A WebKit powered web browser
 Name:		chromium-browser-bin
-Version:	15.0.841.0
+Version:	15.0.875.0
 Release:	%{svnrev}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 # sh get_sources.sh
 Source0:	chromium-browser32-r%{svnrev}.zip
-# NoSource0-md5:	fdb3fa48ae36dba0bd10547a1fbe4165
+# NoSourceSource0-md5:	
 Source1:	chromium-browser64-r%{svnrev}.zip
-# NoSource1-md5:	00956a3ba4d1733a1f62fc458247a880
+# NoSourceSource1-md5:	
 NoSource:	0
 NoSource:	1
 Source2:	chromium-browser.sh
@@ -26,7 +26,7 @@
 Requires:	libpng12 >= 1:1.2.42-2
 Requires:	nspr
 Requires:	nss
-Requires:	xdg-utils
+Requires:	xdg-utils >= 1.0.2-4
 Provides:	wwwbrowser
 Conflicts:	chromium-browser
 Obsoletes:	%{name}-bookmark_manager
@@ -94,6 +94,10 @@
 mv chrome-linux/{chrome,chromium-browser}
 chmod a+x chrome-linux/lib*.so*
 
+# xdg-utils >= 1.0.2-4 satisfies these
+rm chrome-linux/xdg-settings
+rm chrome-linux/xdg-mime
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}/themes}
@@ -101,9 +105,9 @@
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser
 %{__sed} -i -e 's, at libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/chromium-browser
 cp -a chrome-linux/* $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -a chromium-browser.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p chromium-browser.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
@@ -170,10 +174,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/libsmime3.so.1d
 %attr(755,root,root) %{_libdir}/%{name}/libssl3.so.1d
 
-# bundle this copy until xdg-utils will have this itself
-%attr(755,root,root) %{_libdir}/%{name}/xdg-settings
-%attr(755,root,root) %{_libdir}/%{name}/xdg-mime
-
 %files inspector
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/resources/inspector
@@ -187,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2011/09/07 21:47:24  glen
+- system xdg-utils is fine, use it
+
 Revision 1.43  2011/08/02 11:12:55  caleb
 - Up to 15.0.841.0 r95033
 - Added unpackaged files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/chromium-browser-bin.spec?r1=1.43&r2=1.44&f=u