[dnssec-trigger: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/dnssec-trigger

[Paul Wouters]

commit faf8625dbfdb99329ed167f19ffed4f32ee8dcee
Merge: 637203d a53e187
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jul 24 11:33:31 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/dnssec-trigger
    
    Conflicts:
    	dnssec-triggerd.service

 dnssec-trigger.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc dnssec-trigger.spec
index 17ae650,8085852..475db44
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
  Name: dnssec-trigger
  Version: 0.11
--Release: 5%{?dist}
++Release: 6%{?dist}
  License: BSD
  Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
  Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
@@@ -103,6 -101,6 +103,10 @@@ f
      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
  
  %changelog
++* Tue Jul 24 2012 Paul Wouters <pwouters at redhat.com> - 0.11-6
++- Patched daemon to remove immutable attr (rhbz#842455) as the
++  systemd ExecStopPost= target does not seem to work
++
  * Tue Jul 24 2012 Paul Wouters <pwouters at redhat.com> - 0.11-5
  - On service stop, remove immutable attr from resolv.conf (rhbz#842455)