network/nextcloud-desktop: Updated for version 3.4.4.

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

4 files changed, 20 insertions, 12 deletions

diff --git a/network/nextcloud-desktop/doinst.sh b/network/nextcloud-desktop/doinst.sh
index bb8462acaa..1fc4aa5bc1 100644
--- a/network/nextcloud-desktop/doinst.sh
+++ b/network/nextcloud-desktop/doinst.sh
@@ -11,7 +11,7 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config "etc/Nextcloud/sync-exclude.lst.new"
+config etc/Nextcloud/sync-exclude.lst.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/network/nextcloud-desktop/nextcloud-desktop.SlackBuild b/network/nextcloud-desktop/nextcloud-desktop.SlackBuild
index 997a7b062e..286e3320d8 100644
--- a/network/nextcloud-desktop/nextcloud-desktop.SlackBuild
+++ b/network/nextcloud-desktop/nextcloud-desktop.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nextcloud-desktop
 SRCNAM=desktop
-VERSION=${VERSION:-3.4.3}
+VERSION=${VERSION:-3.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -75,6 +75,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
+# handle tarball with a truncated name
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 
 mv $SRCNAM-$VERSION $PRGNAM-$VERSION
@@ -96,14 +97,21 @@ cmake \
 make
 make install DESTDIR=$PKG
 
+# Don't overwrite existing config file:
+mv $PKG/etc/Nextcloud/sync-exclude.lst $PKG/etc/Nextcloud/sync-exclude.lst.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a {CONTRIBUTING.md,COPYING,COPYING.documentation,README.md} \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # put the manual in the right place skipping uneeded files
+# we'll work around sphinx by converting the rst files to man pages
 mkdir -p $PKG/usr/man/man1
-cp $TMP/$PRGNAM-$VERSION/man/nextcloud* $PKG/usr/man/man1/
+rst2man --no-file-insertion -r 5 \
+        $TMP/$PRGNAM-$VERSION/man/nextcloud.1.rst $PKG/usr/man/man1/nextcloud.1
+rst2man --no-file-insertion -r 5 \
+        $TMP/$PRGNAM-$VERSION/man/nextcloudcmd.1.rst $PKG/usr/man/man1/nextcloudcmd.1
 
 find $PKG/usr/man/man1 -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man/man1 -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -113,4 +121,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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/nextcloud-desktop/nextcloud-desktop.info b/network/nextcloud-desktop/nextcloud-desktop.info
index 7b452b1f44..772d764840 100644
--- a/network/nextcloud-desktop/nextcloud-desktop.info
+++ b/network/nextcloud-desktop/nextcloud-desktop.info
@@ -1,10 +1,10 @@
 PRGNAM="nextcloud-desktop"
-VERSION="3.4.3"
+VERSION="3.4.4"
 HOMEPAGE="https://nextcloud.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/nextcloud/desktop/archive/refs/tags/v3.4.3/desktop-3.4.3.tar.gz"
-MD5SUM_x86_64="7f5f0a209fa726533b18c7a19890e027"
+DOWNLOAD_x86_64="https://github.com/nextcloud/desktop/archive/refs/tags/v3.4.4.tar.gz"
+MD5SUM_x86_64="57ac70607a16c1e7ade2d53c5da4330f"
 REQUIRES=""
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/network/nextcloud-desktop/slack-desc b/network/nextcloud-desktop/slack-desc
index bc17d6e15d..0f9357ddf2 100644
--- a/network/nextcloud-desktop/slack-desc
+++ b/network/nextcloud-desktop/slack-desc
@@ -10,10 +10,10 @@ nextcloud-desktop: nextcloud-desktop (Nextcloud Desktop Client)
 nextcloud-desktop:
 nextcloud-desktop: The computer Nextcloud Desktop Client is a tool to synchronize files
 nextcloud-desktop: from Nextcloud Server with your computer.
+nextcloud-desktop: 
+nextcloud-desktop: 
+nextcloud-desktop: 
 nextcloud-desktop:
+nextcloud-desktop: Homepage: https://nextcloud.com/
 nextcloud-desktop:
-nextcloud-desktop:
-nextcloud-desktop:
-nextcloud-desktop: Homepage: http://nextcloud.com/
-nextcloud-desktop:
-nextcloud-desktop:
+nextcloud-desktop: