[vtun] Fix unit file location, cleanup and modernise spec

[Peter Robinson]

commit c8ccdd92b17491ef52b6f66377f88b7b07baf8ad
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 21 20:42:25 2012 +0100

    Fix unit file location, cleanup and modernise spec

 vtun.spec |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/vtun.spec b/vtun.spec
index e675396..cf572ce 100644
--- a/vtun.spec
+++ b/vtun.spec
@@ -1,6 +1,6 @@
 Name: vtun
 Version: 3.0.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Virtual tunnel over TCP/IP networks
 License: GPLv2+
 Group: System Environment/Daemons
@@ -8,10 +8,8 @@ Url: http://vtun.sourceforge.net
 Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: vtun.socket
 Source2: vtun.service
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(preun): /sbin/service
+
 Requires(preun): systemd-units
-Requires(postun): /sbin/service 
 Requires(postun): systemd-units
 BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units
 
@@ -30,16 +28,12 @@ require modification to any kernel parts.
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__install} -D -m 0644 -p %{SOURCE1} %{buildroot}/%{_unitdir}/vtun.socket
-%{__install} -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service
-%{__make} install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p"
-
-%clean
-%{__rm} -rf %{buildroot}
+install -D -m 0644 -p %{SOURCE1} %{buildroot}/%{_unitdir}/vtun.socket
+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
@@ -64,8 +58,8 @@ fi
 %defattr(-,root,root,-)
 %doc ChangeLog Credits FAQ README README.LZO README.Setup README.Shaper TODO vtund.conf
 %config(noreplace) %{_sysconfdir}/vtund.conf
-/lib/systemd/system/vtun.socket
-/lib/systemd/system/vtun.service
+%{_unitdir}/vtun.socket
+%{_unitdir}/vtun.service
 %{_sbindir}/vtund
 %dir %{_localstatedir}/log/vtund
 %ghost %dir %{_localstatedir}/lock/vtund
@@ -74,6 +68,9 @@ fi
 %{_mandir}/man8/vtund.8*
 
 %changelog
+* Mon May 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 3.0.1-14
+- Fix unit file location, cleanup and modernise spec
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild