[system-config-printer/f13/master] Allow %, ( and ) characters in dnssd URI (bug #669820).

[Jiří Popelka]

commit 2cb1a5bc1912e8becd588e933fa15e8da86e4450
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Jan 18 11:51:02 2011 +0100

    Allow %, ( and ) characters in dnssd URI (bug #669820).

 system-config-printer-dnssd-URI.patch |   12 ++++++++++++
 system-config-printer.spec            |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/system-config-printer-dnssd-URI.patch b/system-config-printer-dnssd-URI.patch
new file mode 100644
index 0000000..53c6756
--- /dev/null
+++ b/system-config-printer-dnssd-URI.patch
@@ -0,0 +1,12 @@
+diff -up system-config-printer-1.2.6/system-config-printer.py.dnssd-URI system-config-printer-1.2.6/system-config-printer.py
+--- system-config-printer-1.2.6/system-config-printer.py.dnssd-URI	2011-01-14 17:04:25.000000000 +0100
++++ system-config-printer-1.2.6/system-config-printer.py	2011-01-18 11:46:53.000000000 +0100
+@@ -5654,7 +5654,7 @@ class NewPrinterGUI(GtkGUI):
+             entry.set_text(new_text)
+ 
+     def on_entNPTDevice_changed(self, ent):
+-        allowed_chars = string.letters+string.digits+'_-./:'
++        allowed_chars = string.letters+string.digits+'_-./:%()'
+         self.entry_changed(ent, allowed_chars)
+         self.setNPButtons()
+ 
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 28e6c82..d2b94fe 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{versio
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 # Python bindings for libsmbclient
 Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1:   system-config-printer-dnssd-URI.patch
 Patch101: pysmbc-doczip.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -75,6 +76,9 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
+# allow %,(,) characters in URI
+%patch1 -p1 -b .dnssd-URI
+
 pushd pysmbc-%{pysmbc_version}
 %patch101 -p1 -b .doczip
 popd
@@ -198,6 +202,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Jan 18 2011 Jiri Popelka <jpopelka at redhat.com> 1.2.6-2
+- Allow %, ( and ) characters in dnssd URI (bug #669820).
+
 * Mon Jan 17 2011 Jiri Popelka <jpopelka at redhat.com> 1.2.6-1
 - 1.2.6:
   - Remove reference to current printer on exit (bug #556548).