[rtpproxy] Spec-file cleanups

[Peter Lemenkov]

commit 00b69f62eeebe0df48ff4527f79577ecbdea9ed5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Aug 31 15:40:51 2013 +0400

    Spec-file cleanups
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 rtpproxy.spec |   65 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 36 insertions(+), 29 deletions(-)
---
diff --git a/rtpproxy.spec b/rtpproxy.spec
index 51a30cd..3d0b468 100644
--- a/rtpproxy.spec
+++ b/rtpproxy.spec
@@ -1,12 +1,15 @@
 Name:		rtpproxy
 Version:	1.2.1
-Release:	12.git2121113%{?dist}
+Release:	13.git2121113%{?dist}
 Summary:	A symmetric RTP proxy
 Group:		Applications/Internet
 License:        BSD
 URL:		http://www.rtpproxy.org
+%if 0%{?el7}%{?fedora}
+VCS:		git://git.code.sf.net/p/sippy/rtpproxy
+%endif
 #Source0:	http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz
-## git clone git://sippy.git.sourceforge.net/gitroot/sippy/rtpproxy
+## git clone git://git.code.sf.net/p/sippy/rtpproxy
 ## cd rtpproxy
 ## git archive --format=tar --prefix=rtpproxy-1.2.1/ "fff62d0c4de4a52bc1703be46f446bcb1a06f17f" | gzip > ../rtpproxy-1.2.1-git.tar.gz
 Source0:	%{name}-%{version}-git.tar.gz
@@ -19,6 +22,9 @@ Patch5:		rtpproxy-0005-Fedora-related-fix-for-docbook-path.patch
 Patch6:		rtpproxy-0006-Updated-SysV-init-script-for-legacy-systemd.patch
 Patch7:		rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?el7}%{?fedora}
+BuildRequires:	systemd
+%endif
 BuildRequires:	gsm-devel
 BuildRequires:	libxslt
 BuildRequires:	docbook-style-xsl
@@ -29,10 +35,14 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 Requires(pre):	/usr/sbin/useradd
-%if 0%{!?fedora}
+%if 0%{?el5}%{?el6}
 Requires(post):	/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 Requires(preun):/sbin/service
+%else
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 %endif
 
 
@@ -65,17 +75,17 @@ make rtpproxy.8
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -D -p -m 0644 rpm/%{name}.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-%if 0%{?fedora}
-# install systemd files
-install -D -m 0644 -p rpm/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-install -D -m 0644 -p rpm/%{name}.tmpfiles.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
-%else
+install -D -p -m 0644 rpm/%{name}.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%if 0%{?el5}%{?el6}
 # install init-script
-install -D -p -m 0755 rpm/%{name}.init $RPM_BUILD_ROOT%{_initrddir}/%{name}
+install -D -p -m 0755 rpm/%{name}.init %{buildroot}%{_initrddir}/%{name}
+%else
+# install systemd files
+install -D -m 0644 -p rpm/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
+install -D -m 0644 -p rpm/%{name}.tmpfiles.conf %{buildroot}%{_tmpfilesdir}/%{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/run/%{name}
 %endif
-install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
+install -d %{buildroot}%{_localstatedir}/lib/%{name}
 
 
 %clean
@@ -88,42 +98,35 @@ getent passwd %{name} >/dev/null || \
 
 
 %post
-%if 0%{?fedora}
-if [ $1 -eq 1 ] ; then
-	# Initial installation
-	/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%else
+%if 0%{?el5}%{?el6}
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add s%{name} || :
 fi
+%else
+%systemd_post %{name}.service
 %endif
 
 
 %preun
-%if 0%{?fedora}
-if [ $1 -eq 0 ] ; then
-	# Package removal, not upgrade
-	/usr/bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-	/usr/bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
-%else
+%if 0%{?el5}%{?el6}
 if [ $1 -eq 0 ]; then
 	/sbin/service %{name} stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del %{name} || :
 fi
+%else
+%systemd_preun %{name}.service
 %endif
 
 
 %files
 %doc AUTHORS COPYING README README.remote
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%if 0%{?fedora}
+%if 0%{?el5}%{?el6}
+%{_initrddir}/%{name}
+%else
 %{_unitdir}/%{name}.service
-%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%{_tmpfilesdir}/%{name}.conf
 %dir %attr(0755, rtpproxy, rtpproxy) %{_localstatedir}/run/%{name}
-%else
-%{_initrddir}/%{name}
 %endif
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
@@ -132,6 +135,10 @@ fi
 
 
 %changelog
+* Sat Aug 31 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-13.git2121113
+- Spec-file cleanups
+- Added systemd-macros where necessary
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-12.git2121113
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild