Thu Feb 11 17:08:37 UTC 2010

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11144

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.17.tar.xz.sig 
	system-config-printer-device-settings.patch 
Removed Files:
	system-config-printer-1.1.16.tar.xz.sig 
	system-config-printer-async-fallback-2.patch 
	system-config-printer-async-fallback.patch 
	system-config-printer-asyncpk0-fallback.patch 
	system-config-printer-auth-no-pw.patch 
	system-config-printer-auto_make.patch 
	system-config-printer-check-still-connecting.patch 
	system-config-printer-copy-crash.patch 
	system-config-printer-driver-pre-selection.patch 
	system-config-printer-duplicate-current.patch 
	system-config-printer-foomatic-recommended.patch 
	system-config-printer-ink-levels.patch 
	system-config-printer-jobviewer-exit.patch 
	system-config-printer-notification-timeouts.patch 
	system-config-printer-npinit-traceback.patch 
	system-config-printer-raw-statereason.patch 
	system-config-printer-rename-error-handling.patch 
	system-config-printer-select-nonexistent-printer.patch 
	system-config-printer-serial-widgets.patch 
	system-config-printer-statereason-tmp.patch 
	system-config-printer-typo.patch 
	system-config-printer-userdefault-traceback.patch 
Log Message:
* Thu Feb 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-2
- Avoid clearing device settings when adding printer (bug #563989).

--- NEW FILE system-config-printer-1.1.17.tar.xz.sig ---
ˆ? KqKº´}šJÚ×HI ž5|˜#y¤Yx'Ú´Èp¶«6bÊÙ ž,"ºHŸ“ÐÉÈ¤Þ¢Ëƒu Ú
system-config-printer-device-settings.patch:
 system-config-printer.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-device-settings.patch ---
diff -up system-config-printer-1.1.17/system-config-printer.py.device-settings system-config-printer-1.1.17/system-config-printer.py
--- system-config-printer-1.1.17/system-config-printer.py.device-settings	2010-02-09 11:41:44.000000000 +0000
+++ system-config-printer-1.1.17/system-config-printer.py	2010-02-11 16:56:44.120583145 +0000
@@ -5312,11 +5312,13 @@ class NewPrinterGUI(GtkGUI):
                 iter = model.iter_next (iter)
                 i += 1
         elif not self.device_selected:
+            # Select the device.
             column = self.tvNPDevices.get_column (0)
             self.tvNPDevices.set_cursor ((0,), column)
 
-        column = self.tvNPDeviceURIs.get_column (0)
-        self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
+            # Select the connection.
+            column = self.tvNPDeviceURIs.get_column (0)
+            self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
 
     def on_entNPTDevice_changed(self, entry):
         self.setNPButtons()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/.cvsignore,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- .cvsignore	19 Jan 2010 12:58:04 -0000	1.211
+++ .cvsignore	11 Feb 2010 17:08:35 -0000	1.212
@@ -210,3 +210,4 @@ system-config-printer-1.1.15.tar.xz
 pycups-1.9.47.tar.bz2
 system-config-printer-1.1.16.tar.xz
 pycups-1.9.48.tar.bz2
+system-config-printer-1.1.17.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/sources,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- sources	19 Jan 2010 12:58:04 -0000	1.217
+++ sources	11 Feb 2010 17:08:35 -0000	1.218
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-8c2643d8a670eaadc3fa6890149b753b  system-config-printer-1.1.16.tar.xz
 2e9ed692c75328e7fb88f8c230f70990  pycups-1.9.48.tar.bz2
+b3430b605e5c3e793fdea6899454897f  system-config-printer-1.1.17.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -p -r1.357 -r1.358
--- system-config-printer.spec	8 Feb 2010 17:07:27 -0000	1.357
+++ system-config-printer.spec	11 Feb 2010 17:08:37 -0000	1.358
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.16
-Release: 15%{?dist}
+Version: 1.1.17
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,27 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
-Patch2: system-config-printer-typo.patch
-Patch3: system-config-printer-driver-pre-selection.patch
-Patch4: system-config-printer-foomatic-recommended.patch
-Patch5: system-config-printer-jobviewer-exit.patch
-Patch6: system-config-printer-npinit-traceback.patch
-Patch7: system-config-printer-notification-timeouts.patch
-Patch8: system-config-printer-select-nonexistent-printer.patch
-Patch9: system-config-printer-ink-levels.patch
-Patch10: system-config-printer-auth-no-pw.patch
-Patch11: system-config-printer-copy-crash.patch
-Patch12: system-config-printer-check-still-connecting.patch
-Patch13: system-config-printer-async-fallback.patch
-Patch14: system-config-printer-userdefault-traceback.patch
-Patch15: system-config-printer-serial-widgets.patch
-Patch16: system-config-printer-statereason-tmp.patch
-Patch17: system-config-printer-asyncpk0-fallback.patch
-Patch18: system-config-printer-async-fallback-2.patch
-Patch19: system-config-printer-raw-statereason.patch
-Patch20: system-config-printer-duplicate-current.patch
-Patch21: system-config-printer-rename-error-handling.patch
-Patch22: system-config-printer-auto_make.patch
+Patch2: system-config-printer-device-settings.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -96,27 +76,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
-%patch2 -p1 -b .typo
-%patch3 -p1 -b .driver-pre-selection
-%patch4 -p1 -b .foomatic-recommended
-%patch5 -p1 -b .jobviewer-exit
-%patch6 -p1 -b .npinit-traceback
-%patch7 -p1 -b .notification-timeouts
-%patch8 -p1 -b .select-nonexistent-printer
-%patch9 -p1 -b .ink-levels
-%patch10 -p1 -b .auth-no-pw
-%patch11 -p1 -b .copy-crash
-%patch12 -p1 -b .check-still-connecting
-%patch13 -p1 -b .async-fallback
-%patch14 -p1 -b .userdefault-traceback
-%patch15 -p1 -b .serial-widgets
-%patch16 -p1 -b .statereason-tmp
-%patch17 -p1 -b .asyncpk0-fallback
-%patch18 -p1 -b .async-fallback-2
-%patch19 -p1 -b .raw-statereason
-%patch20 -p1 -b .duplicate-current
-%patch21 -p1 -b .rename-error-handling
-%patch22 -p1 -b .auto_make
+%patch2 -p1 -b .device-settings
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -233,6 +193,18 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Feb 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-2
+- Avoid clearing device settings when adding printer (bug #563989).
+
+* Tue Feb  9 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-1
+- 1.1.17:
+  - When retrying authentication as another user, forbid PolicyKit.
+  - Update 'Time submitted' column when clicking Refresh in job viewer.
+  - udev-add-printer: avoid traceback when no CMD field present.
+  - Fixed window modality and transience.
+  - Set D-Bus timeout when calling asynchronously.
+  - asyncpk1: Handle cancelJob's optional purge_job parameter.
+
 * Mon Feb  8 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-16
 - No longer requires usermode (bug #562270).
 


--- system-config-printer-1.1.16.tar.xz.sig DELETED ---


--- system-config-printer-async-fallback-2.patch DELETED ---


--- system-config-printer-async-fallback.patch DELETED ---


--- system-config-printer-asyncpk0-fallback.patch DELETED ---


--- system-config-printer-auth-no-pw.patch DELETED ---


--- system-config-printer-auto_make.patch DELETED ---


--- system-config-printer-check-still-connecting.patch DELETED ---


--- system-config-printer-copy-crash.patch DELETED ---


--- system-config-printer-driver-pre-selection.patch DELETED ---


--- system-config-printer-duplicate-current.patch DELETED ---


--- system-config-printer-foomatic-recommended.patch DELETED ---


--- system-config-printer-ink-levels.patch DELETED ---


--- system-config-printer-jobviewer-exit.patch DELETED ---


--- system-config-printer-notification-timeouts.patch DELETED ---


--- system-config-printer-npinit-traceback.patch DELETED ---


--- system-config-printer-raw-statereason.patch DELETED ---


--- system-config-printer-rename-error-handling.patch DELETED ---


--- system-config-printer-select-nonexistent-printer.patch DELETED ---


--- system-config-printer-serial-widgets.patch DELETED ---


--- system-config-printer-statereason-tmp.patch DELETED ---


--- system-config-printer-typo.patch DELETED ---


--- system-config-printer-userdefault-traceback.patch DELETED ---

