sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master binary grimoire by Jeremy Blosser (2806e143d5a8071635efa23b8423b3d1d1c9790b)
- From: Jeremy Blosser <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master binary grimoire by Jeremy Blosser (2806e143d5a8071635efa23b8423b3d1d1c9790b)
- Date: Sun, 6 Sep 2015 18:53:55 +0000
GIT changes to master binary grimoire by Jeremy Blosser
<jblosser AT sourcemage.org>:
bin-http/google-chrome-bin/DEPENDS | 18 +++++++++---------
bin-http/google-chrome-bin/HISTORY | 4 ++++
bin-http/google-chrome-bin/PRE_BUILD | 4 ++--
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 2806e143d5a8071635efa23b8423b3d1d1c9790b
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>
google-chrome-bin: Fix .desktop file name for beta, update nss depends
diff --git a/bin-http/google-chrome-bin/DEPENDS
b/bin-http/google-chrome-bin/DEPENDS
index c9e8262..5517f65 100755
--- a/bin-http/google-chrome-bin/DEPENDS
+++ b/bin-http/google-chrome-bin/DEPENDS
@@ -1,11 +1,11 @@
-depends cups &&
-depends dbus-glib &&
-depends gconf2 &&
-depends gtk+2 &&
-depends nspr &&
-depends nss &&
-depends rpm2targz &&
-depends xdg-utils &&
-depends libxscrnsaver &&
+depends cups &&
+depends dbus-glib &&
+depends gconf2 &&
+depends gtk+2 &&
+depends nspr &&
+depends -sub "3.19.x" nss &&
+depends rpm2targz &&
+depends xdg-utils &&
+depends libxscrnsaver &&
suggest_depends xulrunner '' '' 'for Mozilla plugins'
diff --git a/bin-http/google-chrome-bin/HISTORY
b/bin-http/google-chrome-bin/HISTORY
index ccb436b..2438841 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,3 +1,7 @@
+2015-09-06 Jeremy Blosser <jblosser AT sourcemage.org>
+ * DEPENDS: nss needs to be 3.19.x
+ * PRE_BUILD: Extended .desktop name fix for beta as well
+
2015-08-31 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Fixed .desktop file name for unstable, it changes name
between versions
diff --git a/bin-http/google-chrome-bin/PRE_BUILD
b/bin-http/google-chrome-bin/PRE_BUILD
index 529d089..059688b 100755
--- a/bin-http/google-chrome-bin/PRE_BUILD
+++ b/bin-http/google-chrome-bin/PRE_BUILD
@@ -8,8 +8,8 @@ rm -f ${SOURCE/rpm/tar} &&
ln $SOURCE_DIRECTORY/usr/bin/google-chrome{*,-bin} &&
deskfile="$SOURCE_DIRECTORY/usr/share/applications/google-chrome.desktop"
-if [[ $GOOGLE_CHROME_BIN_VERSION == unstable ]]; then
- deskfile="${deskfile%.desktop}-unstable.desktop"
+if [[ $GOOGLE_CHROME_BIN_VERSION != stable ]]; then
+ deskfile="${deskfile%.desktop}-${GOOGLE_CHROME_BIN_VERSION}.desktop"
fi
sed -i
"s:Icon=.*:Icon=$INSTALL_ROOT/opt/google/chrome/product_logo_256.png:" \
- [SM-Commit] GIT changes to master binary grimoire by Jeremy Blosser (2806e143d5a8071635efa23b8423b3d1d1c9790b), Jeremy Blosser, 09/06/2015
Archive powered by MHonArc 2.6.24.