From 84548f8e01b8aa04f4b650dc6b6d354da1d70f8d Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 18 Jan 2011 12:02:41 +0100 Subject: [PATCH] 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 deletion(-) create mode 100644 system-config-printer-dnssd-URI.patch diff --git a/system-config-printer-dnssd-URI.patch b/system-config-printer-dnssd-URI.patch new file mode 100644 index 0000000..a96bb79 --- /dev/null +++ b/system-config-printer-dnssd-URI.patch @@ -0,0 +1,12 @@ +diff -up system-config-printer-1.2.96/newprinter.py.dnssd-URI system-config-printer-1.2.96/newprinter.py +--- system-config-printer-1.2.96/newprinter.py.dnssd-URI 2011-01-18 11:59:38.000000000 +0100 ++++ system-config-printer-1.2.96/newprinter.py 2011-01-18 12:00:05.000000000 +0100 +@@ -2156,7 +2156,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 823f703..cbf5067 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -5,11 +5,12 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.2.96 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{version}.tar.xz +Patch1: system-config-printer-dnssd-URI.patch BuildRequires: cups-devel >= 1.2 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: gettext-devel @@ -66,6 +67,9 @@ printers. %prep %setup -q +# Allow %, ( and ) characters in dnssd URI (bug #669820). +%patch1 -p1 -b .dnssd-URI + %build %configure --with-udev-rules @@ -174,6 +178,9 @@ rm -rf %buildroot exit 0 %changelog +* Tue Jan 18 2011 Jiri Popelka 1.2.96-2 +- Allow %, ( and ) characters in dnssd URI (bug #669820). + * Mon Jan 17 2011 Jiri Popelka 1.2.96-1 - 1.2.96: - Remove reference to current printer on exit (bug #556548).