graphics/gcolor2: New maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

3 files changed, 22 insertions, 20 deletions

diff --git a/graphics/gcolor2/README b/graphics/gcolor2/README
index 5a258055af01..5325b3b8e66f 100644
--- a/graphics/gcolor2/README
+++ b/graphics/gcolor2/README
@@ -1,3 +1,5 @@
+gcolor2 (GTK+2 color selector)
+
 gcolor2 is a simple color selector that was originally based on gcolor,
 ported to GTK+2 and fitted with a new user interface. It only requires
 GTK+2, so it's not dependent on any specific desktop environment.
diff --git a/graphics/gcolor2/gcolor2.SlackBuild b/graphics/gcolor2/gcolor2.SlackBuild
index d296407f448a..d9e03c84a1f9 100644
--- a/graphics/gcolor2/gcolor2.SlackBuild
+++ b/graphics/gcolor2/gcolor2.SlackBuild
@@ -2,8 +2,9 @@
 
 # Slackware build script for gcolor2
 #
-# Copyright 2010, 2011 slakmagik <slakmagik@gmail.com>
-# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2010, 2011 slakmagik
+# Copyright 2020 Dominik Drobek
+# Copyright 2024 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +24,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240902 bkw: BUILD=6
+# - new maintainer.
+# - get useless INSTALL out of package.
+
+# Note to self: have a look at gcolor3:
+# https://packages.debian.org/sid/gcolor3
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gcolor2
 VERSION=${VERSION:-0.4}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -39,9 +47,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -74,11 +79,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # add path to rgb.txt color definitions provided by X11:
 patch -p1 < $CWD/color_definition_path.patch
@@ -101,17 +103,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 install -D -m 644 $CWD/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 install -D -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS ChangeLog COPYING $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/gcolor2/gcolor2.info b/graphics/gcolor2/gcolor2.info
index 608caa3ce6f3..a27f97b816c3 100644
--- a/graphics/gcolor2/gcolor2.info
+++ b/graphics/gcolor2/gcolor2.info
@@ -6,5 +6,5 @@ MD5SUM="02de9d925ad5921522685f402caec3ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dominik Drobek"
-EMAIL="dominik.drobek (at) o2.pl"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"