[rarpd: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rarpd Removing systemd compat calls

[Honza Horak]

commit d410398413862d36d67e672fbdd066a4121d7ab2
Merge: fb0b6ed 27969db
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri May 24 11:45:34 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rarpd
    Removing systemd compat calls
    
    Conflicts:
    	rarpd.spec

 rarpd.spec |   43 +++++++++----------------------------------
 1 files changed, 9 insertions(+), 34 deletions(-)
---
diff --cc rarpd.spec
index 477cf2a,b5c83dd..68014e4
--- a/rarpd.spec
+++ b/rarpd.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: The RARP daemon
  Name: rarpd
  Version: ss981107
--Release: 38%{?dist}
++Release: 39%{?dist}
  License: GPLv2+
  Group: System Environment/Daemons
  Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
@@@ -12,7 -12,7 +12,6 @@@ Patch2: rarpd-sprintf.patc
  Requires(post): systemd-units
  Requires(preun): systemd-units
  Requires(postun): systemd-units
--Requires(post): systemd-sysv
  BuildRequires: systemd-units
  
  %description
@@@ -51,41 -51,41 +50,13 @@@ install -m 755 rarpd ${RPM_BUILD_ROOT}%
  install -m 644 rarpd.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/rarpd.8
  
  %post
--%if 0%{?systemd_post:1}
--  %systemd_post rarpd.service
--%else
--  if [ $1 = 1 ]; then
--      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
--  fi
--%endif
--
--# Package with native systemd unit file is installed for the first time
--%triggerun -- rarpd < ss981107-33
--%{_bindir}/systemd-sysv-convert --save rarpd >/dev/null 2>&1 ||:
--
--# Run these because the SysV package being removed won't do them
--/sbin/chkconfig --del rarpd >/dev/null 2>&1 || :
--/bin/systemctl try-restart rarpd.service >/dev/null 2>&1 || :
++%systemd_post rarpd.service
  
  %preun
--%if 0%{?systemd_preun:1}
--  %systemd_preun rarpd.service
--%else
--  if [ $1 = 0 ]; then
--      /bin/systemctl --no-reload disable rarpd.service >/dev/null 2>&1 || :
--      /bin/systemctl stop rarpd.service >/dev/null 2>&1 || :
--  fi
--%endif
++%systemd_preun rarpd.service
  
  %postun
--%if 0%{?systemd_postun_with_restart:1}
--  %systemd_postun_with_restart rarpd.service
--%else
--  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
--  if [ $1 -ge 1 ]; then
--      /bin/systemctl try-restart rarpd.service >/dev/null 2>&1 || :
--  fi
--%endif
++%systemd_postun_with_restart rarpd.service
  
  %files
  %doc README
@@@ -94,8 -94,8 +65,12 @@@
  %{_unitdir}/*
  
  %changelog
- * Fri Nov 30 2012 Honza Horak <hhorak at redhat.com> - ss981107-38
++* Fri May 24 2013 Honza Horak <hhorak at redhat.com> - ss981107-39
 +- Build the daemon with full relro
++- Removing systemd compat calls
++
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - ss981107-38
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
  
  * Thu Oct 04 2012 Honza Horak <hhorak at redhat.com> - ss981107-37
  - Run %%triggerun regardless of systemd_post variable definition