[unbound: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/unbound

[Paul Wouters]

commit d8a37a063761900a1728f049eac592f3dc2ab688
Merge: 5d36ef2 a523624
Author: Paul Wouters <paul at xelerance.com>
Date:   Thu Sep 15 13:30:00 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/unbound
    
    Conflicts:
    	unbound.spec

 tmpfiles-unbound.conf  |    1 +
 unbound-keygen.service |   15 ++++++++++
 unbound.service        |   14 +++++++++
 unbound.spec           |   72 +++++++++++++++++++++++++++++++----------------
 4 files changed, 77 insertions(+), 25 deletions(-)
---
diff --cc unbound.spec
index c2c415b,32da8e7..e27c02b
--- a/unbound.spec
+++ b/unbound.spec
@@@ -19,11 -19,12 +19,12 @@@ Source3: unbound.muni
  Source4: unbound_munin_
  Source5: root.key
  Source6: dlv.isc.org.key
+ Source7: unbound-keygen.service
+ Source8: tmpfiles-unbound.conf
  Patch1: unbound-1.2-glob.patch
 -Patch2: unbound-1.4.12-pythonmod.patch
 +Patch2: unbound-1.4.13-edns1480.patch
  
  Group: System Environment/Daemons
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires: flex, openssl-devel , ldns-devel >= 1.5.0, 
  BuildRequires: libevent-devel expat-devel
  %if %{with_python}
@@@ -202,12 -210,21 +210,26 @@@ f
  
  %postun libs -p /sbin/ldconfig
  
+ %triggerun -- unbound < 1.4.12-4
+ # Save the current service runlevel info
+ # User must manually run systemd-sysv-convert --apply unbound
+ # to migrate them to systemd targets
+ /usr/bin/systemd-sysv-convert --save unbound >/dev/null 2>&1 ||:
+ 
+ # Run these because the SysV package being removed won't do them
+ /sbin/chkconfig --del unbound >/dev/null 2>&1 || :
+ /bin/systemctl try-restart unbound.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
+ 
  %changelog
 +* Thu Sep 15 2011 Paul Wouters <paul at xelerance.com> - 1.4.13-1
 +- Upgraded to 1.4.13
 +- Removed merged in pythonmod patch
 +- Added EDNS1480 patch to fix unbound on broken EDNS/UDP networks
 +
+ * Wed Sep 14 2011 Tom Callaway <spot at fedoraproject.org> - 1.4.12-4
+ - convert to systemd, tmpfiles.d
+ 
  * Mon Aug 08 2011 Paul Wouters <paul at xelerance.com> - 1.4.12-3
  - Added pythonmod docs and examples