From 1db8282881d89ca56689519949f9fe419e7c4759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B8=D0=BC=D0=BE=D0=BD=D1=8A=20=D0=A1=2E=20=D0=91?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=BA=D0=B0=D0=BD=D0=BE=D0=B2=D1=8A?=
 <sbolokanov@abv.bg>
Date: Fri, 12 Apr 2019 22:31:40 +0700
Subject: desktop/dunst: Updated for version 1.4.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/dunst/README           |  4 ++--
 desktop/dunst/doinst.sh        | 14 --------------
 desktop/dunst/dunst.SlackBuild |  9 +--------
 desktop/dunst/dunst.info       |  8 ++++----
 desktop/dunst/slack-desc       |  2 +-
 5 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 desktop/dunst/doinst.sh

(limited to 'desktop')

diff --git a/desktop/dunst/README b/desktop/dunst/README
index 562debaef1..e6211b084e 100644
--- a/desktop/dunst/README
+++ b/desktop/dunst/README
@@ -7,5 +7,5 @@ we all love to customize to perfection.
 
 Configuration:
 
-To customize dunst you have to copy config file from /etc/xdg/dunst to
-~/.config/dunst/dunstrc, then modify it to your liking.
+To customize dunst you have to copy /usr/share/dunst/dunstrc to
+~/.config/dunst/dunstrc and then modify it to your liking.
diff --git a/desktop/dunst/doinst.sh b/desktop/dunst/doinst.sh
deleted file mode 100644
index c3a0ab28b9..0000000000
--- a/desktop/dunst/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/xdg/dunst/dunstrc.new
diff --git a/desktop/dunst/dunst.SlackBuild b/desktop/dunst/dunst.SlackBuild
index 69ce61ab67..280f4ed721 100644
--- a/desktop/dunst/dunst.SlackBuild
+++ b/desktop/dunst/dunst.SlackBuild
@@ -28,7 +28,7 @@
 #     3.4.2016 - don't clobber the config
 
 PRGNAM=dunst
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,18 +74,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Change config dir to appropriate location
-sed -i 's,${PREFIX}/share/dunst,/etc/xdg/dunst,' Makefile
-
 CFLAGS="$SLKCFLAGS" \
 make DESTDIR=$PKG \
   PREFIX=/usr \
   MANPREFIX=/usr/man \
   all install
 
-# Don't clobber the default config
-mv $PKG/etc/xdg/dunst/dunstrc $PKG/etc/xdg/dunst/dunstrc.new
-
 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
 
@@ -99,7 +93,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -pv $PKG/install
 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}
diff --git a/desktop/dunst/dunst.info b/desktop/dunst/dunst.info
index 315dc27712..63852a8770 100644
--- a/desktop/dunst/dunst.info
+++ b/desktop/dunst/dunst.info
@@ -1,10 +1,10 @@
 PRGNAM="dunst"
-VERSION="1.3.2"
+VERSION="1.4.0"
 HOMEPAGE="https://dunst-project.org/"
-DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.3.2/dunst-1.3.2.tar.gz"
-MD5SUM="68ad9fd1dab537d7a1ad93c899c50278"
+DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.4.0/dunst-1.4.0.tar.gz"
+MD5SUM="8a8095566a1b913056674f802444311a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libxdg-basedir"
+REQUIRES=""
 MAINTAINER="Симонъ С. Болокановъ"
 EMAIL="sbolokanov@abv.bg"
diff --git a/desktop/dunst/slack-desc b/desktop/dunst/slack-desc
index d522300bf5..b22f8e0698 100644
--- a/desktop/dunst/slack-desc
+++ b/desktop/dunst/slack-desc
@@ -14,6 +14,6 @@ dunst: It's very customizable, doesn't depend on any toolkits and therefore
 dunst: fits in those windowmanager centric setups we all love to customize
 dunst: to perfection.
 dunst:
-dunst: Homepage: http://knopwob.org/dunst/
+dunst: Homepage: https://dunst-project.org/
 dunst:
 dunst:
-- 
cgit v1.2.3