[packages/google-chrome] - use sed instead so it will work for beta/unstable, too

arekm arekm at pld-linux.org
Wed Nov 20 10:31:45 CET 2013


commit 36023f6e8b140ca739d301d71b473348ddfe5e25
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Nov 20 10:31:42 2013 +0100

    - use sed instead so it will work for beta/unstable, too

 chrome-desktop.patch | 22 +---------------------
 google-chrome.spec   |  1 +
 2 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/google-chrome.spec b/google-chrome.spec
index c34f621..a585507 100644
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -157,6 +157,7 @@ rm chrome/xdg-mime
 %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
 %{__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
+%{__sed} -i 's#google-chrome-\(stable\|beta\|unstable\)#google-chrome#g' google-chrome.desktop
 
 %build
 v=$(awk -F'"' '/version/{print $4}' browser-plugins/PepperFlash/manifest.json)
diff --git a/chrome-desktop.patch b/chrome-desktop.patch
index ab87683..c63442a 100644
--- a/chrome-desktop.patch
+++ b/chrome-desktop.patch
@@ -1,12 +1,6 @@
 --- google-chrome-15.0.874.106/google-chrome.desktop~	2011-10-27 00:22:10.000000000 +0300
 +++ google-chrome-15.0.874.106/google-chrome.desktop	2011-10-27 00:24:02.861899987 +0300
-@@ -105,12 +105,12 @@
- Comment[zh_CN]=访问互联网
- Comment[zh_HK]=連線到網際網路
- Comment[zh_TW]=連線到網際網路
--Exec=/usr/bin/google-chrome-stable %U
-+Exec=/usr/bin/google-chrome %U
- Terminal=false
+@@ -110,7 +110,7 @@ Terminal=false
  Icon=google-chrome
  Type=Application
  Categories=Network;WebBrowser;
@@ -15,17 +9,3 @@
  X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito
  
  [NewWindow Shortcut Group]
-@@ -165,7 +165,7 @@
- Name[vi]=Cửa sổ Mới
- Name[zh_CN]=新建窗口
- Name[zh_TW]=開新視窗
--Exec=/usr/bin/google-chrome-stable
-+Exec=/usr/bin/google-chrome
- TargetEnvironment=Unity
- 
- [NewIncognito Shortcut Group]
-@@ -220,3 +220,3 @@
- Name[zh_TW]=新增無痕式視窗
--Exec=/usr/bin/google-chrome-stable --incognito
-+Exec=/usr/bin/google-chrome --incognito
- TargetEnvironment=Unity
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/google-chrome.git/commitdiff/36023f6e8b140ca739d301d71b473348ddfe5e25



More information about the pld-cvs-commit mailing list