[dnssec-trigger/f17] * Sun Jun 17 2012 Paul Wouters <pwouters at redhat.com> - 0.11-2 - Small textual changes to some popup

[Paul Wouters]

commit ef452455b651efc7c22e4d503adeb73e3f1586d2
Author: Paul Wouters <paul at libreswan.org>
Date:   Sun Jun 17 12:15:10 2012 -0400

    * Sun Jun 17 2012 Paul Wouters <pwouters at redhat.com> - 0.11-2
    - Small textual changes to some popup windows

 dnssec-trigger-0.11-gui.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 dnssec-trigger.spec           |    8 +++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/dnssec-trigger-0.11-gui.patch b/dnssec-trigger-0.11-gui.patch
new file mode 100644
index 0000000..7b638e1
--- /dev/null
+++ b/dnssec-trigger-0.11-gui.patch
@@ -0,0 +1,40 @@
+diff -Naur dnssec-trigger-0.11-orig/panel/pui.xml dnssec-trigger-0.11/panel/pui.xml
+--- dnssec-trigger-0.11-orig/panel/pui.xml	2012-03-29 09:48:23.000000000 -0400
++++ dnssec-trigger-0.11/panel/pui.xml	2012-06-17 12:07:03.806278004 -0400
+@@ -17,7 +17,9 @@
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+             <property name="label" translatable="yes">Some networks need insecure signon. After you log in to the
+-network via its portal page, select &lt;i&gt;Reprobe&lt;/i&gt; to get secure again.
++network via its portal page, the network will be secured again
++automatically. You can also select &lt;i&gt;Reprobe&lt;/i&gt; to attempt to
++force it to go into secure mode.
+ 
+ &lt;i&gt;Please, stay safe out there.&lt;/i&gt;</property>
+             <property name="use_markup">True</property>
+@@ -81,7 +83,7 @@
+   <object class="GtkDialog" id="noweb_dialog">
+     <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+-    <property name="title" translatable="yes">No Web Access</property>
++    <property name="title" translatable="yes">Web traffic hijacked</property>
+     <property name="type_hint">dialog</property>
+     <property name="urgency_hint">True</property>
+     <signal name="delete-event" handler="on_noweb_dialog_delete_event" swapped="no"/>
+@@ -138,12 +140,12 @@
+           <object class="GtkLabel" id="label3">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="label" translatable="yes">There is no web access on this network. Do you have to login for that?
++            <property name="label" translatable="yes">The web traffic on this network is being hijacked. Is this a hotspot?
+ 
+-While you login you are &lt;i&gt;insecure&lt;/i&gt;, for backwards compatibility, until
+-dnssec-trigger can detect web access.
++While you login you are &lt;i&gt;insecure&lt;/i&gt;, until the traffic hijacking has
++stopped and dnssec-trigger has detected regular web access.
+ 
+-&lt;i&gt;Skip&lt;/i&gt; this if you do not have to log in on this network.</property>
++&lt;i&gt;Skip&lt;/i&gt; if you are not logging into a hotspot right now .</property>
+             <property name="use_markup">True</property>
+           </object>
+           <packing>
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index 8eefdc9..89bb7ac 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,13 +1,14 @@
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
 Version: 0.11
-Release: 1%{?dist}
+Release: 2%{?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
+Patch1: dnssec-trigger-0.11-gui.patch
 Requires(postun): initscripts
 Requires: ldns >= 1.6.10, NetworkManager, unbound, xdg-utils
 Requires(pre): shadow-utils
@@ -33,6 +34,8 @@ sed -i "s/ Panel//" panel/dnssec-trigger-panel.desktop.in
 sed -i "s/-panel//" panel/dnssec-trigger-panel.desktop.in
 # NM has no /usr/sbin in path
 sed -i "s/^dnssec-trigger-control/\/usr\/sbin\/dnssec-trigger-control/" 01-dnssec-trigger-hook.sh.in
+# change some text in the popups
+%patch1 -p1 
 
 %build
 %configure  --with-keydir=/etc/dnssec-trigger 
@@ -94,6 +97,9 @@ fi
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 %changelog
+* Sun Jun 17 2012 Paul Wouters <pwouters at redhat.com> - 0.11-2
+- Small textual changes to some popup windows
+
 * Fri Jun 15 2012 Paul Wouters <pwouters at redhat.com> - 0.11-1
 - Updated to 0.11
 - http Hotspot detection via fedoraproject.org/static/hotspot.html