packages: chromium-browser-bin/chromium-browser-bin.spec, chromium-browser-...

[glen]

Author: glen                         Date: Wed Sep 23 15:14:49 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package xdg-utils for desktop integration

---- Files affected:
packages/chromium-browser-bin:
   chromium-browser-bin.spec (1.4 -> 1.5) , chromium-browser.sh (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/chromium-browser-bin/chromium-browser-bin.spec
diff -u packages/chromium-browser-bin/chromium-browser-bin.spec:1.4 packages/chromium-browser-bin/chromium-browser-bin.spec:1.5
--- packages/chromium-browser-bin/chromium-browser-bin.spec:1.4	Wed Sep 23 11:37:02 2009
+++ packages/chromium-browser-bin/chromium-browser-bin.spec	Wed Sep 23 17:14:44 2009
@@ -16,6 +16,7 @@
 Requires:	browser-plugins >= 2.0
 Requires:	nspr
 Requires:	nss
+Requires:	xdg-utils
 Provides:	wwwbrowser
 ExclusiveArch:	%{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,7 +42,6 @@
 %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
 
 mv chrome-linux/product_logo_48.png .
-mv chrome-linux/xdg-settings .
 mv chrome-linux/chromium-browser.1 .
 mv chrome-linux/chrome-wrapper .
 mv chrome-linux/{chrome,chromium-browser}
@@ -85,6 +85,7 @@
 %{_libdir}/%{name}/resources
 %{_libdir}/%{name}/themes
 %attr(755,root,root) %{_libdir}/%{name}/chromium-browser
+
 # These unique permissions are intentional and necessary for the sandboxing
 %attr(4555,root,root) %{_libdir}/%{name}/chrome_sandbox
 
@@ -102,12 +103,18 @@
 %attr(755,root,root) %{_libdir}/chromium-browser-bin/libsmime3.so.1d
 %attr(755,root,root) %{_libdir}/chromium-browser-bin/libssl3.so.1d
 
+# bundle a this copy until xdg-utils will have this itself
+%attr(755,root,root) %{_libdir}/%{name}/xdg-settings
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2009/09/23 15:14:44  glen
+- package xdg-utils for desktop integration
+
 Revision 1.4  2009/09/23 09:37:02  glen
 - back to 26800, form autofill won't crash here. noauto for ffmpeg deps
 

================================================================
Index: packages/chromium-browser-bin/chromium-browser.sh
diff -u /dev/null packages/chromium-browser-bin/chromium-browser.sh:1.1
--- /dev/null	Wed Sep 23 17:14:50 2009
+++ packages/chromium-browser-bin/chromium-browser.sh	Wed Sep 23 17:14:44 2009
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Always use our ffmpeg libs.
+# Also symlinkes for nss/nspr libs can be found from our dir.
+export LD_LIBRARY_PATH=/usr/lib64/chromium-browser-bin${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
+
+# for to find xdg-settings
+export PATH=/usr/lib64/chromium-browser-bin${PATH:+:"$PATH"}
+
+exec /usr/lib64/chromium-browser-bin/chromium-browser "$@"
================================================================

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