system/sboui: Updated for version 2.2.

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

4 files changed, 21 insertions, 10 deletions

diff --git a/system/sboui/README b/system/sboui/README
index 73315f1bae..b963914a3b 100644
--- a/system/sboui/README
+++ b/system/sboui/README
@@ -28,5 +28,5 @@ GRAPHICAL_SU=kdesu|gksu|ktsuss (default kdesu): change the graphical su
 TERMINAL_EMULATOR=(user choice; default xterm) set the terminal emulator
   to run sboui via the .desktop file and system tray notifier.
 
-USE_NINJA=yes|no (default no): use ninja instead of GNU Make for the
-  build. If enabled, ninja becomes a dependency.
+USE_NINJA=yes|no (default yes): use ninja instead of GNU Make for the
+  build.
diff --git a/system/sboui/doinst.sh b/system/sboui/doinst.sh
index 68000a3b0b..d7769247a7 100644
--- a/system/sboui/doinst.sh
+++ b/system/sboui/doinst.sh
@@ -10,9 +10,20 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+config_blacklist() {
+  # package_blacklist changed names to just blacklist in version 2.2, so make a copy
+  # of package_blacklist -> blacklist for the user to compare with blacklist.new.
+  NEW="etc/sboui/blacklist"
+  OLD="etc/sboui/package_blacklist"
+  if [[ ! -r $NEW && -r $OLD ]]; then
+    cp $OLD $NEW
+  fi
+}
+
 config etc/sboui/sboui.conf.new
 config etc/sboui/sboui-backend.conf.new
-config etc/sboui/package_blacklist.new
+config_blacklist
+config etc/sboui/blacklist.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/system/sboui/sboui.SlackBuild b/system/sboui/sboui.SlackBuild
index 7ecdeb907f..8f9d0996bd 100644
--- a/system/sboui/sboui.SlackBuild
+++ b/system/sboui/sboui.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sboui
 
-# Copyright 2019 | Daniel Prosser | Lexington Park, MD
+# Copyright 2022 | Daniel Prosser | Lexington Park, MD
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sboui
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -80,7 +80,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Build options
-USE_NINJA="${USE_NINJA:-no}"
+USE_NINJA="${USE_NINJA:-yes}"
 GRAPHICAL_SU="${GRAPHICAL_SU:-kdesu}"
 TERMINAL_EMULATOR="${TERMINAL_EMULATOR:-xterm}"
 INSTALL_SYSTRAY_NOTIFIER="${INSTALL_SYSTRAY_NOTIFIER:-no}"
@@ -120,7 +120,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mv $PKG/etc/sboui/sboui.conf $PKG/etc/sboui/sboui.conf.new
 mv $PKG/etc/sboui/sboui-backend.conf $PKG/etc/sboui/sboui-backend.conf.new
-mv $PKG/etc/sboui/package_blacklist $PKG/etc/sboui/package_blacklist.new
+mv $PKG/etc/sboui/blacklist $PKG/etc/sboui/blacklist.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog INSTALL LICENSE README.md \
diff --git a/system/sboui/sboui.info b/system/sboui/sboui.info
index c5abbd71c2..9dcbdbdbcc 100644
--- a/system/sboui/sboui.info
+++ b/system/sboui/sboui.info
@@ -1,8 +1,8 @@
 PRGNAM="sboui"
-VERSION="2.1"
+VERSION="2.2"
 HOMEPAGE="https://github.com/montagdude/sboui"
-DOWNLOAD="https://github.com/montagdude/sboui/archive/2.1/sboui-2.1.tar.gz"
-MD5SUM="c4f7c1c757efc1d7523cace75c1c1078"
+DOWNLOAD="https://github.com/montagdude/sboui/archive/2.2/sboui-2.2.tar.gz"
+MD5SUM="8508f85a7ad472158c7433c886b3b536"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig"