[arch-commits] Commit in pacredir/trunk (PKGBUILD pacredir.install)

[Christian Hesse]

    Date: Thursday, July 5, 2018 @ 13:13:24
  Author: eworm
Revision: 352715

upgpkg: pacredir 0.4.0-1

new upstream release

Modified:
  pacredir/trunk/PKGBUILD
  pacredir/trunk/pacredir.install

------------------+
 PKGBUILD         |    6 ++----
 pacredir.install |   16 +++++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-05 13:07:47 UTC (rev 352714)
+++ PKGBUILD	2018-07-05 13:13:24 UTC (rev 352715)
@@ -2,7 +2,7 @@
 # Maintainer: Christian Hesse <mail at eworm.de>
 
 pkgname=pacredir
-pkgver=0.3.3
+pkgver=0.4.0
 pkgrel=1
 pkgdesc='redirect pacman requests, assisted by avahi service discovery'
 arch=('x86_64')
@@ -10,13 +10,11 @@
 depends=('libsystemd' 'avahi' 'curl' 'iniparser' 'darkhttpd' 'libmicrohttpd')
 makedepends=('systemd' 'markdown')
 license=('GPL')
-conflicts=('paccache')
-replaces=('paccache')
 install=pacredir.install
 backup=('etc/pacredir.conf' 'etc/pacman.d/pacredir')
 validpgpkeys=('BD84DE71F493DF6814B0167254EDC91609BC9183') # Christian Hesse <mail at eworm.de>
 source=("https://www.eworm.de/download/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=('6605263eddbb8990c15dd6ac53c7989348784fa2d42d7379e98fe7607845de90'
+sha256sums=('3e941cd0559cd9cd4b4bb8f8bbe7f5da0201768220fb33d117eb686a52779606'
             'SKIP')
 
 build() {

Modified: pacredir.install
===================================================================
--- pacredir.install	2018-07-05 13:07:47 UTC (rev 352714)
+++ pacredir.install	2018-07-05 13:13:24 UTC (rev 352715)
@@ -4,11 +4,21 @@
 	echo " > For instructions visit: https://github.com/eworm-de/pacredir#usage"
 }
 
+pre_upgrade() {
+	# return if old package version greater 0.4...
+	(( $(vercmp $2 '0.4') > 0 )) && return
+
+	# upgrade from pre-0.4 version, pacdbserve.service no longer exists
+	if systemctl is-enabled -q pacdbserve.service; then
+		systemctl disable -q pacdbserve.service
+	fi
+}
+
 post_upgrade() {
-	# return if old package version greater 0.3...
-	(( $(vercmp $2 '0.3') > 0 )) && return
+	# return if old package version greater 0.4...
+	(( $(vercmp $2 '0.4') > 0 )) && return
 
-	# upgrade from pre-0.3 version, avahi service names changed
+	# upgrade from pre-0.4 version, avahi service names changed
 	echo " > This upgrade from pacredir $2 to pacredir $1 changes avahi service"
 	echo " > names. Make sure to update all your installations for compatibility."
 }