Fix issue with restarts registering as BAD and update to 4.1.0

2 files changed, 12 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7863ad5d024b..3afb25bac2b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = tuptime
 	pkgdesc = Report the historical and statistical running time of system
-	pkgver = 3.4.2
-	pkgrel = 2
+	pkgver = 4.1.0
+	pkgrel = 1
 	url = https://github.com/rfrail3/tuptime
 	install = tuptime.install
 	arch = any
 	license = GPL
 	depends = python
-	source = tuptime-3.4.2.tar.gz::https://github.com/rfrail3/tuptime/archive/3.4.2.tar.gz
-	sha256sums = 784bfcd3026128cf7addaaf821f2f5a9c1d1626f5dd83b3b138090f6fb346e9e
+	source = tuptime-4.1.0.tar.gz::https://github.com/rfrail3/tuptime/archive/4.1.0.tar.gz
+	sha256sums = d8161cd56b627894fbfa4cdfa5a2f7414d0969d4486ec3c9d3e27cd091c6a86e
 
 pkgname = tuptime
 
diff --git a/PKGBUILD b/PKGBUILD
index 6854491e7447..1f4fe2dc6e80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Dennis Stengele <d.stengele (at) derintendant (dot) de>
 pkgname=tuptime
-pkgver=3.4.2
-pkgrel=2
+pkgver=4.1.0
+pkgrel=1
 pkgdesc="Report the historical and statistical running time of system"
 arch=('any')
 url="https://github.com/rfrail3/tuptime"
@@ -11,19 +11,21 @@ depends=(
         )
 install=tuptime.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/rfrail3/tuptime/archive/${pkgver}.tar.gz")
-sha256sums=('784bfcd3026128cf7addaaf821f2f5a9c1d1626f5dd83b3b138090f6fb346e9e')
+sha256sums=('d8161cd56b627894fbfa4cdfa5a2f7414d0969d4486ec3c9d3e27cd091c6a86e')
 
 prepare() {
     cd "$srcdir/$pkgname-${pkgver}"
-    sed -i '/Requires=tuptime.service/d' "src/systemd/tuptime-cron.service"
+    sed -i '/User=tuptime/d' "src/systemd/tuptime.service"
     sed -i '/User=tuptime/d' "src/systemd/tuptime-cron.service"
 }
 
 package() {
     cd "$srcdir/$pkgname-${pkgver}"
     install -D -m755 "src/tuptime" "$pkgdir/usr/bin/tuptime"
-    install -D -m644 "src/systemd/tuptime-cron.service" "$pkgdir/usr/lib/systemd/system/tuptime.service"
-    install -D -m644 "src/systemd/tuptime-cron.timer" "$pkgdir/usr/lib/systemd/system/tuptime.timer"
+    install -D -m644 "src/systemd/tuptime.service" "$pkgdir/usr/lib/systemd/system/tuptime.service"
+    install -D -m644 "src/systemd/tuptime-cron.service" "$pkgdir/usr/lib/systemd/system/tuptime-cron.service"
+    install -D -m644 "src/systemd/tuptime-cron.timer" "$pkgdir/usr/lib/systemd/system/tuptime-cron.timer"
     install -d -m755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
     ln -s "../tuptime.timer" "$pkgdir/usr/lib/systemd/system/timers.target.wants/tuptime.timer"
+    ln -s "../tuptime-cron.timer" "$pkgdir/usr/lib/systemd/system/timers.target.wants/tuptime-cron.timer"
 }