desktop/slack-wallpapers: Updated for version 1.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 70 insertions, 36 deletions

diff --git a/desktop/slack-wallpapers/README b/desktop/slack-wallpapers/README
index b7da965616..2d68dfa9dc 100644
--- a/desktop/slack-wallpapers/README
+++ b/desktop/slack-wallpapers/README
@@ -1,19 +1,26 @@
-This contains a collection of over 400 Slackware-dedicated and/or
+This contains a collection of over 700 Slackware-dedicated and/or
 otherwise related wallpapers.
 
 The images are placed in /usr/share/wallpapers and will be shown in
 the KDE wallpaper chooser. Also, xscreensaver will automatically find
 them there and use the images for screensavers like "Carousel".
 
-The script creates symlinks for the background choosers of XFCE and
-MATE, too. In case you do not want this, check the script.
+There are three options:
+The SlackBuild can create symlinks for the background choosers of XFCE
+or MATE or both, and also optionally add background images for LiLo.
 
-CREDITS:
-I am not the author of these! I just gathered what I already had
-around or have found meanwhile.
+MATE=yes Add symlinks for the MATE Desktop
+XFCE=yes Add symlinks for the XFCE Desktop
+LILO=yes Add background images for LiLo.
+
+Note about LiLo backgrounds;
+LiLo backgrounds require that you edit your /etc/lilo.conf. The
+settings for each background is in /boot/images named the same as the
+image but with a .txt extension. Make sure that you run lilo after
+editing your lilo.conf!
 
+CREDITS:
+I am not the author of these!
 To track all the authors would be quite troublesome or impossible.
 Therefore if someone recognised their work and (rightfully) wants to
-be credited, please let me (skaendo) know!
-
-NOTE: The unarchived size of this is about 300 MB.
+be credited, please let me know!
diff --git a/desktop/slack-wallpapers/slack-wallpapers.SlackBuild b/desktop/slack-wallpapers/slack-wallpapers.SlackBuild
index ecccc7a640..039b45a26a 100644
--- a/desktop/slack-wallpapers/slack-wallpapers.SlackBuild
+++ b/desktop/slack-wallpapers/slack-wallpapers.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for slack-wallpapers
 
-# Copyright 2012-2016  Petar Petrov slackalaxy@gmail.com
-# Copyright 2017  skaendo <skaendo at excite dot com>
+# Copyright 2012-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2017-2018 Skaendo <skaendo at excite dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slack-wallpapers
-VERSION=${VERSION:-0.446}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,38 +43,57 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+
+# I know this is probably some bad hackery, but it works.
+# Suggestions are welcome.
+for i in dated deviantart salix srbija; do
+    if [ -e $CWD/$PRGNAM-$i-$VERSION.tar.bz2 ]; then
+      tar xvf $CWD/$PRGNAM-$i-$VERSION.tar.bz2
+      mv ./*/wallpapers/* ./wallpapers
+    else
+      continue
+    fi
+done
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/wallpapers
-cp -a images/* $PKG/usr/share/wallpapers
-
-# Make symlinks, so XFCE finds the wallpapers automagically. If you do
-# not want this, then comment out the next 6 lines.
-mkdir -p $PKG/usr/share/backgrounds/xfce
-cd $PKG/usr/share/wallpapers/
-for i in *
-do
-ln -s /usr/share/wallpapers/$i $PKG/usr/share/backgrounds/xfce/.
-done
+cp -vr ./wallpapers/* $PKG/usr/share/wallpapers
+
+# Option to add backgrounds for LiLo.
+if [ "${LILO:-no}" = "yes" ]; then
+  mkdir -p $PKG/boot/images
+  cp -vr ./lilo-images/* $PKG/boot/images
+fi
+
+# Option to add symlinks for MATE.
+if [ "${MATE:-no}" = "yes" ]; then
+  mkdir -p $PKG/usr/share/backgrounds/mate
+  cd $PKG/usr/share/wallpapers/
+  for i in *; do
+    ln -s /usr/share/wallpapers/$i $PKG/usr/share/backgrounds/mate/.
+  done
+fi
 
-# Make symlinks for MATE as well. If you do not want this, then comment
-# out the next 6 lines.
-#mkdir -p $PKG/usr/share/backgrounds/mate
-#cd $PKG/usr/share/wallpapers/
-#for i in *
-#do
-#ln -s /usr/share/wallpapers/$i $PKG/usr/share/backgrounds/mate/.
-#done
+# Option to add symlinks for XFCE.
+if [ "${XFCE:-no}" = "yes" ]; then
+  mkdir -p $PKG/usr/share/backgrounds/xfce
+  cd $PKG/usr/share/wallpapers/
+  for i in *; do
+    ln -s /usr/share/wallpapers/$i $PKG/usr/share/backgrounds/xfce/.
+  done
+fi
 
 cd $TMP/$PRGNAM-$VERSION
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog CREDITS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog Contributing README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/slack-wallpapers/slack-wallpapers.info b/desktop/slack-wallpapers/slack-wallpapers.info
index 18d0fc0841..e89ac38e38 100644
--- a/desktop/slack-wallpapers/slack-wallpapers.info
+++ b/desktop/slack-wallpapers/slack-wallpapers.info
@@ -1,10 +1,18 @@
 PRGNAM="slack-wallpapers"
-VERSION="0.446"
+VERSION="1.0"
 HOMEPAGE="https://skaendoblog.wordpress.com/slack-wallpapers"
-DOWNLOAD="https://www.dropbox.com/s/x91razl6grwog91/slack-wallpapers-0.446.tar.bz2"
-MD5SUM="a46588eeda3171492b9958f0739838c4"
+DOWNLOAD="https://www.dropbox.com/s/8v2qx3d78utj6vs/slack-wallpapers-1.0.tar.bz2 \
+		  https://www.dropbox.com/s/651eoapkpyv3mci/slack-wallpapers-dated-1.0.tar.bz2 \
+		  https://www.dropbox.com/s/hyohew1vxpcg4nu/slack-wallpapers-deviantart-1.0.tar.bz2 \
+		  https://www.dropbox.com/s/tdz50e39izl777k/slack-wallpapers-salix-1.0.tar.bz2 \
+                  https://www.dropbox.com/s/g3lafbrab12qyhw/slack-wallpapers-srbija-1.0.tar.bz2"
+MD5SUM="1f47e9f03f4c3815ccdb24d823f8acd4 \
+		1208dff059f188a9eeeaa25debea9a64 \
+		f6207a2728258c75ebea1e77e55e5512 \
+		a1e0f8ffe26d5e5ae7a575ac9eb67e3e \
+		2cd2a9d4030ad6100e380bf252c2bad5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="skaendo"
+MAINTAINER="Skaendo"
 EMAIL="skaendo at excite dot com"