desktop/gnome-colors: Added shiki-colors themes.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 27 insertions, 7 deletions

diff --git a/desktop/gnome-colors/README b/desktop/gnome-colors/README
index 049534d415..2cc785e817 100644
--- a/desktop/gnome-colors/README
+++ b/desktop/gnome-colors/README
@@ -4,6 +4,7 @@ color customization of themes, icons, GDM logins, and splash screens.
 There are nine full color-schemes available; Noble (Purple),
 Brave (Blue), Human (Orange), Wine (Red), Dust (Chocolate), Illustrious
 (Pink), Wise (Green), Carbonite	(Dark-grow) and Tribute (Light-grow).
+Shiki-Colors GTK themes can also be installed.
 
 Edit /etc/gtk-2.0/gtkrc or create ~/.gtkrc-2.0 to change the default gtk
 icon theme. There should be the string:
diff --git a/desktop/gnome-colors/gnome-colors.SlackBuild b/desktop/gnome-colors/gnome-colors.SlackBuild
index 85f53a7a01..15d6c91396 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) 2010  Eugene Wissner <eugen@flevum.de>
+# Copyright (c) 2010  Eugene Wissner <belka.ew@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 
 PRGNAM=gnome-colors
 VERSION=${VERSION:-5.5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -52,11 +52,15 @@ OUTPUT=${OUTPUT:-/tmp}
 # don't download gnome-colors-extras.
 # carbonite:	dark-grow
 # tribute:	light-grow
+#
+# You can also put shiki-colors in the directory to install the
+# gtk and xfwm themes.
 
 # 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"
+SHIKI_VERSION=${SHIKI_VERSION:-4.6}
 
 set -e
 
@@ -80,7 +84,7 @@ find . \
 
 # Install icons
 for j in ${COLORS}; do
-  make DESTDIR="$PKG" install-gnome-${j};
+  make DESTDIR="$PKG" install-gnome-${j}
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -89,6 +93,19 @@ cp -a \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Install shiki-colors if exist
+rm -rf *
+if [ -e "$CWD/shiki-colors-$SHIKI_VERSION.tar.gz" ] ; then
+	tar xvf $CWD/shiki-colors-$SHIKI_VERSION.tar.gz
+	chown -R root:root .
+	find . \
+	  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+	    -exec chmod 755 {} \; -o \
+	  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+	    -exec chmod 644 {} \;
+	make DESTDIR="$PKG" install
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/desktop/gnome-colors/gnome-colors.info b/desktop/gnome-colors/gnome-colors.info
index 0c6349d8e4..1d8b1fc202 100644
--- a/desktop/gnome-colors/gnome-colors.info
+++ b/desktop/gnome-colors/gnome-colors.info
@@ -2,11 +2,13 @@ PRGNAM="gnome-colors"
 VERSION="5.5.1"
 HOMEPAGE="http://code.google.com/p/gnome-colors/"
 DOWNLOAD="http://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz \
-          http://gnome-colors.googlecode.com/files/gnome-colors-extras-5.5.1.tar.gz"
+          http://gnome-colors.googlecode.com/files/gnome-colors-extras-5.5.1.tar.gz \
+          http://gnome-colors.googlecode.com/files/shiki-colors-4.6.tar.gz"
 MD5SUM="8ec81b556bac351817bd56a1701dbbfb \
-        02132ab0483c54a45ac49df22f90c163"
+        02132ab0483c54a45ac49df22f90c163 \
+        b0e5e6d20132ae46a3114ee357f9ec24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Eugene Wissner"
-EMAIL="eugen@flevum.de"
-APPROVED="rworkman"
+EMAIL="belka.ew@gmail.com"
+APPROVED="dsomero"