[vtun/f18] update to 3.0.3; new systemd-rpm macros (#850362)

[Gabriel L. Somlo]

commit f55bca28a16e5d41a6b79dcc136144766fce978f
Author: Gabriel L. Somlo <somlo at hedwig.ini.cmu.edu>
Date:   Thu Sep 13 10:51:07 2012 -0400

    update to 3.0.3; new systemd-rpm macros (#850362)

 .gitignore |    1 +
 sources    |    2 +-
 vtun.spec  |   25 ++++++++++---------------
 3 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78cf322..f9c375d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 vtun-3.0.1.tar.gz
 /vtun-3.0.1.tar.gz
+/vtun-3.0.3.tar.gz
diff --git a/sources b/sources
index 6c68109..d62f2f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c342ffe77055d4248a38f0b380f28c1b  vtun-3.0.1.tar.gz
+f3becf2a0270910a841060c08d1db824  vtun-3.0.3.tar.gz
diff --git a/vtun.spec b/vtun.spec
index e917e32..a4616af 100644
--- a/vtun.spec
+++ b/vtun.spec
@@ -1,6 +1,6 @@
 Name: vtun
-Version: 3.0.1
-Release: 15%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 Summary: Virtual tunnel over TCP/IP networks
 License: GPLv2+
 Group: System Environment/Daemons
@@ -9,6 +9,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: vtun.socket
 Source2: vtun.service
 
+Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units
@@ -36,23 +37,13 @@ install -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service
 make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p"
 
 %post
-if [ $1 -eq 1 ]; then
-	/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post vtun.service vtun.socket
 
 %preun
-if [ $1 -eq 0 ]; then
-	/bin/systemctl --no-reload disable vtun.socket >/dev/null 2>&1 || :
-	/bin/systemctl --no-reload disable vtun.service >/dev/null 2>&1 || :
-	/bin/systemctl stop vtun.socket >/dev/null 2>&1 || :
-	/bin/systemctl stop vtun.service >/dev/null 2>&1 || :
-fi
+%systemd_preun vtun.service vtun.socket
 
 %postun
-if [ $1 -eq 1 ]; then
-	/bin/systemctl try-restart vtun.socket >/dev/null 2>&1 || :
-	/bin/systemctl try-restart vtun.service >/dev/null 2>&1 || :
-fi
+%systemd_postun vtun.service vtun.socket
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +59,10 @@ fi
 %{_mandir}/man8/vtund.8*
 
 %changelog
+* Thu Sep 13 2012 Gabriel Somlo <somlo at cmu.edu> 3.0.3-1
+- update to 3.0.3
+- new systemd-rpm macros (#850362)
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild