From ad1b1833ef7c081fab1d2fa8a45f2f663180b68d Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 12 Dec 2023 19:54:42 +0000
Subject: Tue Dec 12 19:54:42 UTC 2023

a/aaa_libraries-15.1-x86_64-24.txz:  Rebuilt.
  Upgraded: libglib-2.0.so.0.7800.3, libgmodule-2.0.so.0.7800.3,
  libgobject-2.0.so.0.7800.3, libgthread-2.0.so.0.7800.3.
  Removed: libicudata.so.73.2, libicui18n.so.73.2, libicuio.so.73.2,
  libicutest.so.73.2, libicutu.so.73.2, libicuuc.so.73.2.
ap/rpm-4.19.1-x86_64-1.txz:  Upgraded.
l/frei0r-plugins-2.3.2-x86_64-1.txz:  Upgraded.
l/icu4c-74.2-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-115.5.2-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/115.5.2/releasenotes/
xap/x3270-4.3ga4-x86_64-1.txz:  Upgraded.
extra/brltty/brltty-6.6-x86_64-2.txz:  Rebuilt.
  Recompiled against icu4c-74.2.
---
 source/ap/rpm/rpm.SlackBuild | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'source/ap/rpm')

diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
index 68948eea8..1120faa73 100755
--- a/source/ap/rpm/rpm.SlackBuild
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -109,28 +109,18 @@ cd cmake-build
     -DWITH_AUDIT=OFF \
     -DWITH_SELINUX=OFF \
     -DWITH_INTERNAL_OPENPGP=ON \
+    -DENABLE_TESTSUITE=OFF \
     .. || exit 1
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
 cd ..
 
-# Put this in the system directory:
-mkdir -p $PKG/usr/share
-mv $PKG/etc/dbus-1 $PKG/usr/share
-rmdir $PKG/etc
-
-# It seems this doesn't work...
-#make install-man DESTDIR=$PKG || exit 1
-#for dir in . fr ja ko pl ru sk ; do
-#  if /bin/ls docs/man/$dir/*.1 1> /dev/null 2> /dev/null ; then
-#    mkdir -p $PKG/usr/man/$dir/man1
-#    cp -a docs/man/$dir/*.1 $PKG/usr/man/$dir/man1
-#  fi
-#  if /bin/ls docs/man/$dir/*.8 1> /dev/null 2> /dev/null ; then
-#    mkdir -p $PKG/usr/man/$dir/man8
-#    cp -a docs/man/$dir/*.8 $PKG/usr/man/$dir/man8
-#  fi
-#done
+if [ -d $PKG/etc/dbus-1 ]; then
+  # Put this in the system directory:
+  mkdir -p $PKG/usr/share
+  mv $PKG/etc/dbus-1 $PKG/usr/share
+  rmdir $PKG/etc
+fi
 
 # This used to be at /bin/rpm, so make a symlink from there to the new
 # location:
@@ -163,7 +153,7 @@ rmdir $PKG/usr/share/doc/rpm
 mrdir $PKG/usr/share/doc
 rm -rf $PKG/usr/doc/rpm-$VERSION/API
 cp -a \
-  COPYING* CREDITS* GROUPS* INSTALL* README* TODO* doc/manual \
+  CONTRIBUTING* COPYING* CREDITS* INSTALL* README* docs/manual \
     $PKG/usr/doc/rpm-$VERSION
 
 # If there's a ChangeLog file, installing at least part of the recent history
@@ -180,4 +170,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/rpm-$VERSION-$ARCH-$BUILD.txz
-
-- 
cgit v1.2.3-65-gdbad