From bbdff3516e6834d0463eb043e68f49f7658d1e65 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Tue, 18 Sep 2012 15:09:25 -0700 Subject: [PATCH] Ditch the sysvinit stuff --- packaging/iputils.changes | 3 +++ packaging/iputils.spec | 23 +---------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/packaging/iputils.changes b/packaging/iputils.changes index b60273b..bc8dfbd 100644 --- a/packaging/iputils.changes +++ b/packaging/iputils.changes @@ -1,3 +1,6 @@ +* Tue Sep 18 22:08:47 UTC 2012 - tracy.graydon@intel.com +- Ditch teh sysvinit stuff + * Tue Sep 18 19:37:22 UTC 2012 - tracy.graydon@intel.com - Initial import of iputils. diff --git a/packaging/iputils.spec b/packaging/iputils.spec index afa6a63..b0e07e4 100644 --- a/packaging/iputils.spec +++ b/packaging/iputils.spec @@ -37,8 +37,6 @@ BuildRequires: eglibc-headers BuildRequires: libidn-devel BuildRequires: openssl-devel BuildRequires: libcap-devel -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig %description @@ -47,16 +45,6 @@ including ping. The ping command sends a series of ICMP protocol ECHO_REQUEST packets to a specified network host to discover whether the target machine is alive and receiving network traffic. -%package sysvinit -Group: System Environment/Daemons -Summary: SysV initscript for rdisc daemon -Requires: %{name} = %{version}-%{release} -Requires(preun): /sbin/service -Requires(postun): /sbin/service - -%description sysvinit -The iputils-sysvinit contains SysV initscritps support. - %prep %setup -q -a 1 -n %{name}-s%{version} @@ -125,7 +113,7 @@ ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d -install -m 755 -p %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc +#install -m 755 -p %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_unitdir} @@ -149,12 +137,6 @@ if [ "$1" -ge "1" ]; then /bin/systemctl try-restart rdisc.service >/dev/null 2>&1 || : fi -%triggerun -- %{name} < 20101006-9 - /sbin/chkconfig --del rdisc >/dev/null 2>&1 || : - /bin/systemctl try-restart rdisc.service >/dev/null 2>&1 || : - -%triggerpostun -n %{name}-sysvinit -- %{name} < 20101006-9 - /sbin/chkconfig --add rdisc >/dev/null 2>&1 || : %clean rm -rf ${RPM_BUILD_ROOT} @@ -177,6 +159,3 @@ rm -rf ${RPM_BUILD_ROOT} %attr(644,root,root) %{_mandir}/man8/* %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc -%files sysvinit -%{_sysconfdir}/rc.d/init.d/rdisc - -- 2.7.4