diff --git a/system-config-printer-cupsd.conf-parser.patch b/system-config-printer-cupsd.conf-parser.patch new file mode 100644 index 0000000..571830a --- /dev/null +++ b/system-config-printer-cupsd.conf-parser.patch @@ -0,0 +1,12 @@ +diff -up system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser system-config-printer-1.1.15/AdvancedServerSettings.py +--- system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser 2009-09-01 12:08:33.000000000 +0100 ++++ system-config-printer-1.1.15/AdvancedServerSettings.py 2009-12-03 17:18:29.015925153 +0000 +@@ -154,7 +154,7 @@ class AdvancedServerSettingsDialog: + self.browse_poll = [] + f.seek (0) + for line in f.readlines (): +- l = line.lower () ++ l = line.lower ().strip () + if l.startswith ("preservejobhistory "): + try: + preserve_job_history = parse_yesno (l) diff --git a/system-config-printer.spec b/system-config-printer.spec index 8162c16..261bcf9 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 Patch1: system-config-printer-no-epydoc.patch Patch2: system-config-printer-localize-statereason.patch Patch3: system-config-printer-browsepoll.patch +Patch4: system-config-printer-cupsd.conf-parser.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -80,6 +81,7 @@ printers. %patch1 -p1 -b .no-epydoc %patch2 -p1 -b .localize-statereason %patch3 -p1 -b .browsepoll +%patch4 -p1 -b .cupsd.conf-parser %build %configure --with-udev-rules --with-polkit-1 @@ -193,6 +195,7 @@ exit 0 %changelog * Thu Dec 3 2009 Tim Waugh - 1.1.15-3 +- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003). - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986). * Thu Dec 3 2009 Tim Waugh - 1.1.15-2