system/fpm2: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

3 files changed, 16 insertions, 23 deletions

diff --git a/system/fpm2/README b/system/fpm2/README
index 0fdff7d6058a6..89da3e9c7dedb 100644
--- a/system/fpm2/README
+++ b/system/fpm2/README
@@ -1,2 +1,4 @@
-Figaro's Password Manager 2 is a program that allows you to securely store
-passwords. It is using a GTK2 interface.
+fpm2 (Figaro's Password Manager 2)
+
+Figaro's Password Manager 2 is a program that allows you to securely
+store passwords. It uses a GTK2 interface.
diff --git a/system/fpm2/fpm2.SlackBuild b/system/fpm2/fpm2.SlackBuild
index c89b515037baf..fd97957bb6454 100644
--- a/system/fpm2/fpm2.SlackBuild
+++ b/system/fpm2/fpm2.SlackBuild
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fpm2
@@ -32,15 +34,12 @@ PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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
@@ -52,8 +51,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,9 +74,9 @@ 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 \
+  -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 {} \+
 
 patch -p1 < $CWD/01-preserve_column_width.patch
 patch -p1 < $CWD/02-sighandler.patch
@@ -86,26 +85,18 @@ aclocal
 automake --add-missing
 autoreconf
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-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/share/icons/hicolor/48x48/apps
-cat $CWD/fpm2.png > $PKG/usr/share/icons/hicolor/48x48/apps/fpm2.png
-
-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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+cp -a AUTHORS ChangeLog COPYING NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/fpm2/slack-desc b/system/fpm2/slack-desc
index 5663bbc9b8773..13267593bc685 100644
--- a/system/fpm2/slack-desc
+++ b/system/fpm2/slack-desc
@@ -9,7 +9,7 @@
 fpm2: fpm2 (Figaro's Password Manager 2)
 fpm2:
 fpm2: Figaro's Password Manager 2 is a program that allows you to securely
-fpm2: store the passwords. It is using GTK2 interface.
+fpm2: store passwords. It uses a GTK2 interface.
 fpm2:
 fpm2: Homepage: https://als.regnet.cz/fpm2/
 fpm2: