[dnssec-trigger/el6] * Mon Mar 05 2012 Paul Wouters <pwouters at redhat.com> - 0.10-5 - Build for EL6, initscripts, not syst

[Paul Wouters]

commit 0b8db7e2e51a601b5e32b456e7357c29dedd4ac9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 4 21:04:04 2012 -0500

    * Mon Mar 05 2012 Paul Wouters <pwouters at redhat.com> - 0.10-5
    - Build for EL6, initscripts, not systemd

 dnssec-trigger.spec |   52 +++++++++++++++++++++-----------------------------
 1 files changed, 22 insertions(+), 30 deletions(-)
---
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index 1150058..9108b27 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,23 +1,20 @@
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
 Version: 0.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
 Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
-Source1:dnssec-triggerd.service
-Source2: dnssec-triggerd-keygen.service
-Source3: dnssec-trigger.conf
-Requires(postun): initscripts
+Source1: dnssec-trigger.conf
 Requires: ldns >= 1.6.10, NetworkManager, unbound
-Requires(pre): shadow-utils
 BuildRequires: desktop-file-utils systemd-units, openssl-devel, ldns-devel
 BuildRequires: gtk2-devel, NetworkManager-devel
 
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
+Requires(pre): shadow-utils
 
 %description
 dnssec-trigger reconfigures the local unbound DNS server. This unbound DNS
@@ -41,10 +38,9 @@ sed -i "s/^dnssec-trigger-control/\/usr\/sbin\/dnssec-trigger-control/" 01-dnsse
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{_unitdir}
-install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}d.service
-install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}d-keygen.service
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/
+install -d 0755 %{buildroot}%{_initrddir}
+install -m 0644 fedora/dnssec-triggerd.init %{buildroot}%{_initrddir}/dnssec-triggerd
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications dnssec-trigger-panel.desktop
 
@@ -57,8 +53,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files 
 %defattr(-,root,root,-)
 %doc README LICENSE
-%{_unitdir}/%{name}d.service
-%{_unitdir}/%{name}d-keygen.service
+%attr(0755,root,root) %{_initrddir}/dnssec-triggerd
 
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}
 %attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger-hook
@@ -74,26 +69,23 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %post
-# Enable (but don't start) the units by default
-    /bin/systemctl enable %{name}d.service >/dev/null 2>&1 || :
-    /bin/systemctl enable %{name}d-keygen.service >/dev/null 2>&1 || :
-
+/sbin/chkconfig --add dnssec-triggerd
 
 %preun
-if [ "$1" -eq "0" ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}d.service > /dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable %{name}d-keygen.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}d.service >/dev/null 2>&1 || :
-    /bin/systemctl stop %{name}d-keygen.service >/dev/null 2>&1 || :
-    # dnssec-triggerd makes /etc/resolv.conf immutable, undo that on removal
-    chattr -i /etc/resolv.conf
+if [ $1 -eq 0 ]; then
+        /sbin/service dnssec-triggerd stop >/dev/null 2>&1
+        /sbin/chkconfig --del dnssec-triggerd
 fi
 
-%postun 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%postun
+if [ "$1" -ge "1" ]; then
+  /sbin/service dnssec-triggerd condrestart >/dev/null 2>&1 || :
+fi
 
 %changelog
+* Mon Mar 05 2012 Paul Wouters <pwouters at redhat.com> - 0.10-5
+- Build for EL6, initscripts, not systemd
+
 * Thu Feb 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-4
 - Require: unbound