diff options
| author | Eric Sandall | 2010-03-30 11:32:17 -0700 |
|---|---|---|
| committer | Eric Sandall | 2010-03-30 11:34:33 -0700 |
| commit | 833ef79915d47ec796e7fef1a0eebcebdf825dd1 (patch) | |
| tree | ec6c91f3a3ebe3dc144539a80534020343d3c265 | |
| parent | 35c616b90a57a8b23b87b8280e53f2bcd9abe9ef (diff) | |
google-chrome-bin: Depends on xdg-utils
Rename google-chrome symlink to google-chrome-bin
Copy usr directory (contains a google-chrome symlink as well)
| -rwxr-xr-x | bin-http/google-chrome-bin/DEPENDS | 1 | ||||
| -rw-r--r-- | bin-http/google-chrome-bin/HISTORY | 5 | ||||
| -rwxr-xr-x | bin-http/google-chrome-bin/INSTALL | 6 | ||||
| -rwxr-xr-x | bin-http/google-chrome-bin/PRE_BUILD | 8 |
4 files changed, 13 insertions, 7 deletions
diff --git a/bin-http/google-chrome-bin/DEPENDS b/bin-http/google-chrome-bin/DEPENDS index 6ae922d..daded15 100755 --- a/bin-http/google-chrome-bin/DEPENDS +++ b/bin-http/google-chrome-bin/DEPENDS @@ -4,5 +4,6 @@ depends gtk+2 && depends nspr && depends nss && depends rpm2targz && +depends xdg-utils && suggest_depends xulrunner '' '' 'for Mozilla plugins' diff --git a/bin-http/google-chrome-bin/HISTORY b/bin-http/google-chrome-bin/HISTORY index 75c3a2a..ede8dd0 100644 --- a/bin-http/google-chrome-bin/HISTORY +++ b/bin-http/google-chrome-bin/HISTORY @@ -3,6 +3,11 @@ * PRE_BUILD: updated for rpm2targz * PRE_BUILD: added verify_file +2010-02-24 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Depends on xdg-utils + * PRE_BUILD: Rename google-chrome symlink to google-chrome-bin + * INSTALL: Copy usr directory (contains a google-chrome symlink as well) + 2010-01-06 Eric Sandall <sandalle@sourcemage.org> * PREPARE: Query for daily updates * DETAILS: Apparently these RPMs change daily, switching to unversioned diff --git a/bin-http/google-chrome-bin/INSTALL b/bin-http/google-chrome-bin/INSTALL index 4b670f9..5b04fe0 100755 --- a/bin-http/google-chrome-bin/INSTALL +++ b/bin-http/google-chrome-bin/INSTALL @@ -4,9 +4,7 @@ rm -f $SOURCE_DIRECTORY/opt/google/chrome/google-chrome.desktop && install -d -m 0755 $INSTALL_ROOT/opt/google && cp -arv $SOURCE_DIRECTORY/opt/google/* $INSTALL_ROOT/opt/google && - -ln -s $TRACK_ROOT/opt/google/chrome/google-chrome \ - $INSTALL_ROOT/usr/bin/google-chrome && +cp -arv $SOURCE_DIRECTORY/usr $INSTALL_ROOT/ if [[ -d $INSTALL_ROOT/usr/lib/xulrunner/plugins ]] then @@ -15,7 +13,7 @@ then fi && # -# Google Chrome RPM links to weird .so.1d and .so.0d +# Google Chrome links to weird .so.1d and .so.0d # http://code.google.com/p/chromium/issues/detail?id=13425 # for lib in nss3 nssutil3 smime3 ssl3 diff --git a/bin-http/google-chrome-bin/PRE_BUILD b/bin-http/google-chrome-bin/PRE_BUILD index 3eee7e5..8a93224 100755 --- a/bin-http/google-chrome-bin/PRE_BUILD +++ b/bin-http/google-chrome-bin/PRE_BUILD @@ -1,7 +1,9 @@ mk_source_dir $SOURCE_DIRECTORY && cd $SOURCE_DIRECTORY && - verify_file && - rpm2tar $SOURCE_CACHE/$SOURCE && -tar xf google-chrome-beta_current_i386.tar +tar xf google-chrome-beta_current_i386.tar && + +mv $SOURCE_DIRECTORY/usr/bin/google-chrome{,-bin} && +sed -i "s:Icon=.*:Icon=$INSTALL_ROOT/opt/google/chrome/product_logo_256.png:" \ + $SOURCE_DIRECTORY/opt/google/chrome/google-chrome.desktop |