Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master binary grimoire by Eric Sandall 
<sandalle AT sourcemage.org>:

 bin-http/google-chrome-bin/BUILD                 |    3 ++-
 bin-http/google-chrome-bin/DEPENDS               |    1 +
 bin-http/google-chrome-bin/DETAILS               |    3 +++
 bin-http/google-chrome-bin/HISTORY               |   13 +++++++++++++
 bin-http/google-chrome-bin/INSTALL               |   12 ++++++++----
 bin-http/google-chrome-bin/PRE_BUILD             |   11 ++++++++---
 bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig |binary
 7 files changed, 35 insertions(+), 8 deletions(-)

New commits:
commit 5da1ad42ae0ad4e0024332bbc8bf8cf71522de31
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    google-chrome-bin: After extracting tar SOURCE, remove

commit e77a066b86e8587f7f54694577375682de6f8102
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    google-chrome-bin: Download and build a copy of jpeg 7
    
    google-chrome-bin requires libjpeg.so.62 (from jpeg 7). Build and copy a
    version just for google-chrome-bin (does *not* install libjpeg.so.62 to
    /usr/lib).

commit 37cda20ff49e087a4ed95c22e7a623f1d1bdc125
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <esandall@esandall-desktop.(none)>

    google-chrome-bin: Tar is named based on , works on x86_64 now

commit 833ef79915d47ec796e7fef1a0eebcebdf825dd1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <esandall@esandall-desktop.(none)>

    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)

diff --git a/bin-http/google-chrome-bin/BUILD 
b/bin-http/google-chrome-bin/BUILD
index 27ba77d..9aff105 100755
--- a/bin-http/google-chrome-bin/BUILD
+++ b/bin-http/google-chrome-bin/BUILD
@@ -1 +1,2 @@
-true
+cd $SOURCE_DIRECTORY/jpeg-7 &&
+default_build
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/DETAILS 
b/bin-http/google-chrome-bin/DETAILS
index 928bf86..11a5fc1 100755
--- a/bin-http/google-chrome-bin/DETAILS
+++ b/bin-http/google-chrome-bin/DETAILS
@@ -11,9 +11,12 @@ then
 else
           SOURCE=${SPELL/-bin/}-beta_current_i386.rpm
 fi
+         SOURCE2=jpegsrc.v7.tar.gz
    SOURCE_IGNORE=unversioned
+     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dl.google.com/linux/direct/$SOURCE
+  SOURCE2_URL[0]=http://www.ijg.org/files/$SOURCE2
       LICENSE[0]=http://www.google.com/chrome/eula.html
         WEB_SITE=http://chrome.google.com/
         KEYWORDS="web http"
diff --git a/bin-http/google-chrome-bin/HISTORY 
b/bin-http/google-chrome-bin/HISTORY
index 75c3a2a..c3038ec 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,8 +1,21 @@
+2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_BUILD: Tar is named based on $SOURCE, works on x86_64 now
+         Verify and unpack jpeg 7
+         After extracting tar SOURCE, remove
+       * DETAILS: Add jpeg 7 source
+       * BUILD: Build jpeg 7
+       * INSTALL: Copy libjpeg.so to chrome/libjpeg.so.62
+
 2010-03-28 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: rpmunpack -> rpm2targz #15582
        * PRE_BUILD: updated for rpm2targz
        * PRE_BUILD: added verify_file
 
+2010-02-24 Eric Sandall <sandalle AT 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 AT 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..2e7599a 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
@@ -29,3 +27,9 @@ do
   ln -s $TRACK_ROOT/usr/lib/lib$lib.so \
         $INSTALL_ROOT/opt/google/chrome/lib$lib.so.0d
 done
+
+#
+# Copy custom-build libjpeg.so, stupid binaries
+#
+cp -v $SOURCE_DIRECTORY/jpeg-7/.libs/libjpeg.so \
+  $INSTALL_ROOT/opt/google/chrome/libjpeg.so.62
diff --git a/bin-http/google-chrome-bin/PRE_BUILD 
b/bin-http/google-chrome-bin/PRE_BUILD
index 3eee7e5..9975c64 100755
--- a/bin-http/google-chrome-bin/PRE_BUILD
+++ b/bin-http/google-chrome-bin/PRE_BUILD
@@ -1,7 +1,12 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-
 verify_file &&
-
 rpm2tar $SOURCE_CACHE/$SOURCE &&
-tar xf google-chrome-beta_current_i386.tar
+tar xf ${SOURCE/rpm/tar} &&
+rm -f ${SOURCE/rpm/tar} &&
+verify_file '2' &&
+unpack_file '2' &&
+
+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
diff --git a/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig 
b/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig
new file mode 100644
index 0000000..d70e875
Binary files /dev/null and b/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig 
differ