3 files changed, 29 insertions, 16 deletions
diff --git a/misc/kronometer/README b/misc/kronometer/README
index 991e3f5b1c..549b9e77c8 100644
--- a/misc/kronometer/README
+++ b/misc/kronometer/README
@@ -1,4 +1,5 @@
-Kronometer is a stopwatch application built for the KDE Desktop Environment.
-It features the basic stopwatch actions (pause/resume/reset/laps), as well as
-the ability to save the times on a file and resume them later.
-Kronometer is part of the KDE Extragear collection, within the Utils sub-module.
+Kronometer is a stopwatch application built for the KDE
+Desktop Environment. It features the basic stopwatch actions
+(pause/resume/reset/laps), as well as the ability to save the times on
+a file and resume them later. Kronometer is part of the KDE Extragear
+collection, within the Utils sub-module.
diff --git a/misc/kronometer/kronometer.SlackBuild b/misc/kronometer/kronometer.SlackBuild
index 4a3574fef9..8cf3af76e2 100644
--- a/misc/kronometer/kronometer.SlackBuild
+++ b/misc/kronometer/kronometer.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Kronometer
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kronometer
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+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
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-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"
@@ -74,6 +84,7 @@ cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DKDE_INSTALL_MANDIR=/usr/man \
     -DCMAKE_INSTALL_PREFIX=/usr ..
   make
   make install DESTDIR=$PKG
@@ -82,10 +93,11 @@ cd ..
 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
 
-# No man pages with kronometer
+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 COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -93,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/kronometer/kronometer.info b/misc/kronometer/kronometer.info
index 061a254c37..840ea58cd7 100644
--- a/misc/kronometer/kronometer.info
+++ b/misc/kronometer/kronometer.info
@@ -1,8 +1,8 @@
 PRGNAM="kronometer"
-VERSION="1.6.0"
+VERSION="2.2.3"
 HOMEPAGE="https://userbase.kde.org/Kronometer"
-DOWNLOAD="https://download.kde.org/stable/kronometer/1.6.0/src/kronometer-1.6.0.tar.xz"
-MD5SUM="8e1a3ec57862c02d74e026e5825103bb"
+DOWNLOAD="https://download.kde.org/stable/kronometer/2.2.3/src/kronometer-2.2.3.tar.xz"
+MD5SUM="9d597e9fb8efe6802d6f85db22f5b753"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""