From 7eb00f5c91b4e069551b5f28e52dd2302c2ce7d2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Jul 14 2018 15:06:36 +0000
Subject: Upgrade to 1.18 (#1551364)


Signed-off-by: Adrian Reber <adrian@lisas.de>

---

diff --git a/.gitignore b/.gitignore
index 1801006..1273904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ vnstat-1.11.tar.gz
 /vnstat-1.15.tar.gz
 /vnstat-1.16.tar.gz
 /vnstat-1.17.tar.gz
+/vnstat-1.18.tar.gz
diff --git a/sources b/sources
index c3b4077..362dc36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vnstat-1.17.tar.gz) = c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
+SHA512 (vnstat-1.18.tar.gz) = 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68
diff --git a/vnstat.service.patch b/vnstat.service.patch
index 4033530..f79c784 100644
--- a/vnstat.service.patch
+++ b/vnstat.service.patch
@@ -7,4 +7,4 @@
 +User=vnstat
  ExecStart=/usr/sbin/vnstatd -n
  ExecReload=/bin/kill -HUP $MAINPID
- 
+ Restart=on-failure
diff --git a/vnstat.spec b/vnstat.spec
index 74c511f..f91b31d 100644
--- a/vnstat.spec
+++ b/vnstat.spec
@@ -1,7 +1,7 @@
 Summary: Console-based network traffic monitor
 Name: vnstat
-Version: 1.17
-Release: 5%{?dist}
+Version: 1.18
+Release: 1%{?dist}
 
 License: GPLv2
 Group: System Environment/Daemons
@@ -69,17 +69,6 @@ exit 0
 %postun
 %systemd_postun_with_restart vnstat.service
 
-%triggerun -- vnstat < 1.11-8
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply httpd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save vnstat >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del vnstat >/dev/null 2>&1 || :
-/bin/systemctl try-restart vnstat.service >/dev/null 2>&1 || :
-
-
 %files
 %license COPYING
 %doc CHANGES FAQ README INSTALL examples
@@ -95,6 +84,9 @@ exit 0
 
 
 %changelog
+* Sat Jul 14 2018 Adrian Reber <adrian@lisas.de> - 1.18-1
+- Upgrade to 1.18 (#1551364)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild