From 238f2af030367ddd0d0a014e19be72c45483e153 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 22 Jan 2019 01:38:43 +0000
Subject: Tue Jan 22 01:38:43 UTC 2019

a/btrfs-progs-4.20-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20190118_a8b75ca-noarch-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-26.txz:  Rebuilt.
  rc.S: Don't sleep for 3 seconds before mounting non-root filesystems. This
  should not be needed once udev reports having settled all devices.
  Let me know if I'm wrong. :-)
d/parallel-20190122-noarch-1.txz:  Upgraded.
l/glib2-2.58.3-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.4-x86_64-1.txz:  Upgraded.
l/librsvg-2.44.12-x86_64-1.txz:  Upgraded.
l/python-packaging-19.0-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.15-x86_64-1.txz:  Upgraded.
x/libinput-1.12.6-x86_64-1.txz:  Upgraded.
xfce/exo-0.12.4-x86_64-1.txz:  Upgraded.
---
 source/a/btrfs-progs/btrfs-progs.SlackBuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/a/btrfs-progs')

diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild
index 2de9fe6ae..60f7eb376 100755
--- a/source/a/btrfs-progs/btrfs-progs.SlackBuild
+++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild
@@ -51,7 +51,7 @@ fi
 # 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  echo "$PKGNAM-$(echo $VERSION | tr -d v)-$ARCH-$BUILD.txz"
   exit 0
 fi
 
@@ -150,14 +150,14 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+mkdir -p $PKG/usr/doc/${PKGNAM}-$(echo $VERSION | tr -d v)
 cp -a \
   COPYING* INSTALL README* \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
+  $PKG/usr/doc/${PKGNAM}-$(echo $VERSION | tr -d v)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $TMP/package-${PKGNAM}
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr -d v)-$ARCH-$BUILD.txz
 
-- 
cgit v1.2.3