1 files changed, 8 insertions, 3 deletions
diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild
index fc4eba2a1e812..de9f8afae267d 100644
--- a/desktop/fvwm3/fvwm3.SlackBuild
+++ b/desktop/fvwm3/fvwm3.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for fvwm3
 
 # Copyright 2020-2024, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2024, K. Eugene Carlson, Tsukuba, Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fvwm3
 VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -74,6 +75,8 @@ cd $PRGNAM-$VERSION
 # borrowed from ALT Linux
 # https://git.altlinux.org/gears/f/fvwm3.git?a=blob_plain;f=0001-rename-perl-fvwm.patch
 zcat $CWD/0001-rename-perl-fvwm.patch.gz | patch -p2
+# fix references to renamed man pages and binaries
+zcat $CWD/renamed-items.patch.gz | patch -p0
 
 chown -R root:root .
 find -L . \
@@ -82,6 +85,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+OSNAME="$(awk -F= '/^ID=/{print $2}' /etc/os-release)"
+
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -97,7 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --program-prefix= \
   --program-suffix= \
   --program-transform-name='/vwm[^3]/ s/vwm/vwm3/' \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-$OSNAME-linux
 
 make
 make install DESTDIR=$PKG
@@ -118,7 +123,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.md NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install