desktop/gnome-colors: Updated for version 5.5

4 files changed, 64 insertions, 35 deletions

diff --git a/desktop/gnome-colors/README b/desktop/gnome-colors/README
index 1b3814534d09f..6a05f6085b79f 100644
--- a/desktop/gnome-colors/README
+++ b/desktop/gnome-colors/README
@@ -1,11 +1,12 @@
-The GNOME-Colors is a project that aims to make the GNOME desktop as
-elegant, consistent and colorful as possible.  The current goal is to
-allow full color customization of themes, icons, GDM logins and splash
-screens. There are already five full color-schemes available; Noble (Purple),
-Brave (Blue), Human (Orange), Wine (Red) and Wise (Green).  GNOME-Colors is
-mostly inspired/based on Tango, GNOME, Elementary, Tango-Generator and
-many other open-source projects.
+The GNOME-Colors is a project that aims to make the desktop as elegant,
+consistent and colorful as possible. The current goal is to allow full
+color customization of themes, icons, GDM logins and splash screens.
+There are already seven full color-schemes available; Noble (Purple),
+Brave (Blue), Human (Orange), Wine (Red), Dust (Chocolate), Illustrious
+(Pink) and Wise (Green).
+GNOME-Colors is mostly inspired/based on Tango, GNOME, Elementary,
+Tango-Generator and many other open-source projects.
 
-Don't forget to set gtk-icon-theme-name attribute in your ~/.gtkrc-2.0
-to one of the five color schemes (gnome-noble, gnome-brave, gnome-human,
-gnome-wine,and gnome-wise) in order for this icon theme to take effect.
+If you want to have extras themes; Carbonite (dark grey) and Tribute
+(light grey) - put the gnome-color-extras archive (of the same 
+version!) in the path with SlackBuild.
diff --git a/desktop/gnome-colors/gnome-colors.SlackBuild b/desktop/gnome-colors/gnome-colors.SlackBuild
index ac9218ff04752..01abcc9e2521f 100644
--- a/desktop/gnome-colors/gnome-colors.SlackBuild
+++ b/desktop/gnome-colors/gnome-colors.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for GNOME-Colors
 
-# Copyright (c) 2008  Eugene Wissner <belka.ew@gmail.com>
+# Copyright (c) 2009  Eugene Wissner <belka.ew@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -23,12 +23,13 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Modified by the SlackBuilds.org project
 
 PRGNAM=gnome-colors
-VERSION=${VERSION:-3.8.8}
-# Hardcode the ARCH as this truly is architecture-independent
+VERSION=${VERSION:-5.5}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -36,19 +37,39 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# The following colors are available:
+# brave:  	blue
+# dust:	 	chocolate
+# human: 	orange
+# illustrious: 	pink
+# noble: 	purple
+# wine:		red
+# wise:		green
+#
+# These two themes are from gnome-colors-extras. If you don't want to
+# install them, don't worry, leave the second array so and  simply
+# don't download gnome-colors-extras.
+# carbonite:	dark-grow
+# tribute:	light-grow
+
+# If you don't want all of these installed, edit the following arrays
+# to only include those you would like to install.
+COLORS="brave dust human illustrious noble wine wise"
+COLORS_EXTRAS="carbonite tribute"
+
 set -e
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-mkdir -p $TMP/$PRGNAM-$VERSION
+rm -rf $PKG $TMP/$PRGNAM-$VERSION
+mkdir -p $PKG $OUTPUT $TMP/$PRGNAM-$VERSION
+
 cd $TMP/$PRGNAM-$VERSION
 tar xvf $CWD/gnome-colors-$VERSION.tar.gz
-mkdir -p $PKG/usr/share/icons
-tar xvf gnome-brave.tar.gz -C $PKG/usr/share/icons
-tar xvf gnome-human.tar.gz -C $PKG/usr/share/icons
-tar xvf gnome-wine.tar.gz -C $PKG/usr/share/icons
-tar xvf gnome-wise.tar.gz -C $PKG/usr/share/icons
-tar xvf	gnome-noble.tar.gz -C $PKG/usr/share/icons
+
+if [ -e "$CWD/gnome-colors-extras-$VERSION.tar.gz" ] ; then
+  tar xvf $CWD/gnome-colors-extras-$VERSION.tar.gz
+  COLORS=${COLORS}" "${COLORS_EXTRAS}
+fi
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -56,6 +77,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
     -exec chmod 644 {} \;
 
+# Install icons
+for j in ${COLORS}; do
+  make DESTDIR="$PKG" install-gnome-${j};
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog README \
@@ -67,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/gnome-colors/gnome-colors.info b/desktop/gnome-colors/gnome-colors.info
index 5f58917e90f37..a5adce56fa670 100644
--- a/desktop/gnome-colors/gnome-colors.info
+++ b/desktop/gnome-colors/gnome-colors.info
@@ -1,8 +1,10 @@
 PRGNAM="gnome-colors"
-VERSION="3.8.8"
+VERSION="5.5"
 HOMEPAGE="http://code.google.com/p/gnome-colors/"
-DOWNLOAD="http://slackbuilds.org/sources/12.2/gnome-colors-3.8.8.tar.gz"
-MD5SUM="b44b58b2f2d269f227991e5b3c02cd73"
+DOWNLOAD="http://gnome-colors.googlecode.com/files/gnome-colors-5.5.tar.gz http://gnome-colors.googlecode.com/files/gnome-colors-extras-5.5.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="905bed4d6d9c1f6bb897586d36b9f118 e0dbc774bf48ea82e8ba763c0782740a"
+MD5SUM_x86_64=""
 MAINTAINER="Eugene Wissner"
 EMAIL="belka.ew@gmail.com"
-APPROVED="chess"
+APPROVED="dsomero"
diff --git a/desktop/gnome-colors/slack-desc b/desktop/gnome-colors/slack-desc
index fba50ed2e7d07..b3bac393f5a44 100644
--- a/desktop/gnome-colors/slack-desc
+++ b/desktop/gnome-colors/slack-desc
@@ -8,12 +8,12 @@
             |-----handy-ruler-------------------------------------------------------|
 gnome-colors: gnome-colors (extra icon themes for the gnome desktop)
 gnome-colors:
-gnome-colors: The GNOME-Colors is a project that aims to make the GNOME desktop as
-gnome-colors: elegant, consistent and colorful as possible. The current goal is to
-gnome-colors: allow full color customization of themes, icons, GDM logins and splash
-gnome-colors: screens. There are already five full color-schemes available; Noble
-gnome-colors: (Purple), Brave (Blue), Human (Orange), Wine (Red) and Wise (Green).
+gnome-colors: The GNOME-Colors is a project that aims to make the desktop as
+gnome-colors: elegant, consistent and colorful as possible. The current goal is
+gnome-colors: to allow full color customization of themes, icons, GDM logins
+gnome-colors: and splash screens.  There are already seven full color-schemes
+gnome-colors: available; Noble (Purple), Brave (Blue), Human (Orange), Wine
+gnome-colors: (Red), Dust (Chocolate), Illustrious (Pink) and Wise (Green).
 gnome-colors: GNOME-Colors is mostly inspired/based on Tango, GNOME, Elementary,
 gnome-colors: Tango-Generator and many other open-source projects.
-gnome-colors:
-gnome-colors: Homepage:  http://code.google.com/p/gnome-colors/
+gnome-colors: Homepage: http://code.google.com/p/gnome-colors