[tinc] * Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.24-2 - Migration to systemd (rhbz#

[Fabian Affolter]

commit 5259c6c1ec52987330ef849d9e3b6f6112c83825
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Wed May 21 23:48:21 2014 +0200

    * Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.24-2
    - Migration to systemd (rhbz#1078237)

 tinc.spec     |   22 +++++++++++++++++++---
 tincd.service |   12 ++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/tinc.spec b/tinc.spec
index 0fa2569..f889b92 100644
--- a/tinc.spec
+++ b/tinc.spec
@@ -1,17 +1,23 @@
 Name:           tinc
 Version:        1.0.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A virtual private network daemon
 
 License:        GPLv2+
 URL:            http://www.tinc-vpn.org/
 Source0:        http://www.tinc-vpn.org/packages/%{name}-%{version}.tar.gz
+Source1:        tincd.service
 
 BuildRequires:  openssl-devel
 BuildRequires:  lzo-devel
+BuildRequires:  systemd
+BuildRequires:  systemd-units
 
-Requires(post):  info
-Requires(preun): info
+Requires(post):   info
+Requires(post):   systemd
+Requires(preun):  info
+Requires(preun):  systemd
+Requires(postun): systemd
 
 %description
 tinc is a Virtual Private Network (VPN) daemon that uses tunnelling
@@ -31,23 +37,33 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} INSTALL="install -p"
+install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}d.service
 rm -f %{buildroot}%{_infodir}/dir
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+%systemd_post %{name}d.service
 
 %preun
 if [ $1 = 0 ] ; then
 /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
+%systemd_preun %{name}d.service
+
+%postun
+%systemd_postun_with_restart %{name}d.service
 
 %files
 %doc AUTHORS COPYING COPYING.README NEWS README THANKS doc/sample* doc/*.tex
 %{_mandir}/man*/%{name}*.*
 %{_infodir}/%{name}.info.gz
 %{_sbindir}/%{name}d
+%{_unitdir}/%{name}d.service
 
 %changelog
+* Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.24-2
+- Migration to systemd (rhbz#1078237)
+
 * Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.24-1
 - Update to new upstream version 1.0.24
 
diff --git a/tincd.service b/tincd.service
new file mode 100644
index 0000000..f97d804
--- /dev/null
+++ b/tincd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Tinc VPN daemon for network %i
+After=network.target
+
+[Service]
+Type=forking
+Restart=on-failure
+ExecStart=/usr/sbin/tincd -n %i
+ExecStart=/usr/sbin/tincd -n %i -k
+
+[Install]
+WantedBy=multi-user.target