[dnssec-trigger/f16: 8/8] Merge branch 'f17' into f16

[Paul Wouters]

commit bae6343bb9e32046663c36b13839a0b771a99f6c
Merge: ad36911 0a565b8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jun 29 13:19:47 2012 -0400

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	dnssec-trigger.conf
    	dnssec-trigger.spec
    	sources

 .gitignore                      |    3 +-
 01-dnssec-trigger-hook-nm-0.9.4 |   22 ++++++++++++++++++++
 dnssec-trigger-0.11-gui.patch   |   40 +++++++++++++++++++++++++++++++++++++
 dnssec-trigger.conf             |   27 +++++++++++++++++++++++-
 dnssec-trigger.spec             |   42 ++++++++++++++++++++++----------------
 sources                         |    3 +-
 6 files changed, 113 insertions(+), 24 deletions(-)
---
diff --cc .gitignore
index d0f0d1d,b7a7a8d..4685046
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--/dnssec-trigger-0.9.tar.gz
--/dnssec-trigger-0.10.tar.gz
+ /dnssec-trigger-0.11.tar.gz
diff --cc 01-dnssec-trigger-hook-nm-0.9.4
index 0000000,85a8837..85a8837
mode 000000,100755..100755
--- a/01-dnssec-trigger-hook-nm-0.9.4
+++ b/01-dnssec-trigger-hook-nm-0.9.4
diff --cc dnssec-trigger.spec
index 1150058,07d404c..ea51c08
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@@ -1,15 -1,17 +1,17 @@@
  Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
  Name: dnssec-trigger
- Version: 0.10
- Release: 4%{?dist}
+ Version: 0.11
 -Release: 3%{?dist}
++Release: 1%{?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
 -Source4: 01-dnssec-trigger-hook-f17
++Source4: 01-dnssec-trigger-hook-nm-0.9.4
+ Patch1: dnssec-trigger-0.11-gui.patch
  Requires(postun): initscripts
- Requires: ldns >= 1.6.10, NetworkManager, unbound
 -Requires: ldns >= 1.6.10, NetworkManager, unbound, xdg-utils
++Requires: ldns >= 1.6.10, NetworkManager >= 0.9.4, unbound, xdg-utils
  Requires(pre): shadow-utils
  BuildRequires: desktop-file-utils systemd-units, openssl-devel, ldns-devel
  BuildRequires: gtk2-devel, NetworkManager-devel
@@@ -48,6 -52,9 +52,9 @@@ install -m 0644 %{SOURCE3} %{buildroot}
  
  desktop-file-install --dir=%{buildroot}%{_datadir}/applications dnssec-trigger-panel.desktop
  
 -# overwrite the stock dhcp hook, as nmcli syntax changed on f17+
++# overwrite the stock dhcp hook, as nmcli syntax changed on nm 0.9.[34]
+ cp -p %{SOURCE4} %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger-hook
+ 
  # supress the panel name everywhere including the gnome3 panel at the bottom
  ln -s dnssec-trigger-panel %{buildroot}%{_bindir}/dnssec-trigger
  
@@@ -94,26 -101,25 +101,25 @@@ f
      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
  
  %changelog
- * Thu Feb 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-4
 -* Thu Jun 28 2012 Paul Wouters <pwouters at redhat.com> - 0.11-1
++* Fri Jun 29 2012 Paul Wouters <pwouters at redhat.com> - 0.11-1
+ - Updated to 0.11
 -- Fix DHCP hook for f17+ version of nmcli (rhbz#835298)
++- Fix DHCP hook for nm > 0.9.3  version of nmcli (rhbz#835298)
+ - Small textual changes to some popup windows
+ - http Hotspot detection via fedoraproject.org/static/hotspot.html
+ - http Hotspot Login page via uses hotspot-nocache.fedoraproject.org
+ 
 -* Thu Feb 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-4
 -- Require: unbound
++* Fri Mar 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-4
++- Bump for EVR
+ 
+ * Thu Feb 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-1
+ - The NM hook lacked /usr/sbin in path, resulting in empty
+   resolv.conf on hotspot
+ - Fire NM dispatcher in ExecStartPost of dnssec-triggerd.service
  - Require: unbound
- 
- * Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-3
  - Fix the systemd startup to require unbound
  - dnssec-triggerd no longer forks, giving systemd more control
- - Fire NM dispatcher in ExecStartPost of dnssec-triggerd.service
- - Fix tcp80 entries in dnssec-triggerd.conf
  - symlink dnssec-trigger-panel to dnssec-trigger to supress the
    "-panel" in the applet name shown in gnome3
- 
- 
- * Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-2
- - The NM hook was not modified at the right time during build
- 
- * Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-1
- - Updated to 0.10
- - The NM hook lacks /usr/sbin in path, resulting in empty resolv.conf on hotspot
- 
- * Wed Feb 08 2012 Paul Wouters <pwouters at redhat.com> - 0.9-4
  - Updated tls443 / tls80 resolver instances supplied by Fedora Hosted
  
  * Mon Feb 06 2012 Paul Wouters <pwouters at redhat.com> - 0.9-3