[rtpproxy] Works with systemd

[Peter Lemenkov]

commit aa077218023b07a93ec605a12f5494f5dd2fc9bd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Nov 23 00:16:15 2011 +0400

    Works with systemd
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 rtpproxy.service       |   11 +++++++++++
 rtpproxy.spec          |   26 +++++++++++++++++++++++---
 rtpproxy.tmpfiles.conf |    1 +
 3 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/rtpproxy.service b/rtpproxy.service
new file mode 100644
index 0000000..ab67334
--- /dev/null
+++ b/rtpproxy.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A symmetric RTP proxy
+After=network.target
+
+[Service]
+Type=simple
+User=rtpproxy
+Group=rtpproxy
+EnvironmentFile=/etc/sysconfig/rtpproxy
+PIDFile=/var/run/rtpproxy/rtpproxy.pid
+ExecStart=/usr/bin/rtpproxy -f -p /var/run/rtpproxy/rtpproxy.pid $OPTIONS
diff --git a/rtpproxy.spec b/rtpproxy.spec
index b90a2ba..9085288 100644
--- a/rtpproxy.spec
+++ b/rtpproxy.spec
@@ -1,6 +1,6 @@
 Name:           rtpproxy
 Version:        1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A symmetric RTP proxy
 Group:          Applications/Internet
 License:        BSD
@@ -8,6 +8,9 @@ URL:            http://www.rtpproxy.org
 Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz
 Source1:        rtpproxy.sysconfig
 Source2:	rtpproxy.init
+# systemd stuff
+Source3:	rtpproxy.service
+Source4:	rtpproxy.tmpfiles.conf
 # See https://bugzilla.redhat.com/626863
 Patch1:		rtpproxy-0001-Allow-group-users-write-to-the-controlling-UNIX-sock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,7 +40,15 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+%if 0%{?fc15}%{?fc16}%{?fc17}
+# install systemd files
+install -D -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+install -D -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
+%else
+# install init-script
 install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+%endif
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 
@@ -64,14 +75,23 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.remote
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%{_sysconfdir}/init.d/%{name}
+%if 0%{?fc15}%{?fc16}%{?fc17}
+%{_unitdir}/%{name}.service
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%dir %attr(0755, rtpproxy, rtpproxy) %{_localstatedir}/run/%{name}
+%else
+%{_initrddir}/%{name}
+%endif
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
 %{_mandir}/man8/rtpproxy.8*
-%dir %{_localstatedir}/lib/%{name}
+%dir %attr(0750, rtpproxy, rtpproxy) %{_localstatedir}/lib/%{name}
 
 
 %changelog
+* Wed Nov 23 2011 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-5
+- Works with systemd
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/rtpproxy.tmpfiles.conf b/rtpproxy.tmpfiles.conf
new file mode 100644
index 0000000..5e4143f
--- /dev/null
+++ b/rtpproxy.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/rtpproxy 0755 rtpproxy rtpproxy