desktop/siva-flat-themes: Fixed theme folder.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 9 insertions, 26 deletions

diff --git a/desktop/siva-flat-themes/README b/desktop/siva-flat-themes/README
index de988369403e9..2135013df959c 100644
--- a/desktop/siva-flat-themes/README
+++ b/desktop/siva-flat-themes/README
@@ -1,9 +1,6 @@
 siva-flat-themes (GTK2|GTK3 themes).
 
 Siva Flat Themes for gtk3, gtk2, metacity, unity, xfwm4, openbox and
-emerald. There are 8 themes included.
+emerald themes. There are 8 themes included.
 
-Requirements for gtk3 theme: gnome-themes-standard and gtk-engine-unico.
-Requirements for gtk2 theme: gtk-engines and gtk-engine-murrine.
-
-Optional dependencies: gtk-engines, murrine, gtk-engines-unico.
+NOTE: This requires: gtk-engines, gtk-engines-unico and murrine.
diff --git a/desktop/siva-flat-themes/doinst.sh b/desktop/siva-flat-themes/doinst.sh
deleted file mode 100644
index aea0f894eb32b..0000000000000
--- a/desktop/siva-flat-themes/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/desktop/siva-flat-themes/siva-flat-themes.SlackBuild b/desktop/siva-flat-themes/siva-flat-themes.SlackBuild
index 6d2fbba1dc56e..12272eeedbd7f 100644
--- a/desktop/siva-flat-themes/siva-flat-themes.SlackBuild
+++ b/desktop/siva-flat-themes/siva-flat-themes.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
+#
 # Slackware build script for siva-flat-themes.
-
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+#
+# Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 
 PRGNAM="siva-flat-themes"
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -39,20 +40,18 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
 mkdir -p $PKG/usr/share/themes
-cp -a * $PKG/usr/share/themes
+cp -r * $PKG/usr/share/themes
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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.${PKGTYPE:-tgz}
diff --git a/desktop/siva-flat-themes/slack-desc b/desktop/siva-flat-themes/slack-desc
index 4e28fae98d371..37acf19476456 100644
--- a/desktop/siva-flat-themes/slack-desc
+++ b/desktop/siva-flat-themes/slack-desc
@@ -9,7 +9,7 @@
 siva-flat-themes: siva-flat-themes (GTK2|GTK3 themes)
 siva-flat-themes:
 siva-flat-themes: Siva Flat Themes for gtk3, gtk2, metacity, unity, xfwm4, openbox and
-siva-flat-themes: emerald.
+siva-flat-themes: emerald themes.
 siva-flat-themes:
 siva-flat-themes: Home page: http://nale12.deviantart.com/art/Siva-Flat-1-3-0-353499016
 siva-flat-themes: