Fri Nov 27 18:02:26 UTC 2009

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.14.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.13.tar.xz.sig 
	system-config-printer-autoselect-raw.patch 
	system-config-printer-cancel-traceback.patch 
	system-config-printer-center.patch 
	system-config-printer-custom-state-reasons.patch 
	system-config-printer-data-button-state.patch 
	system-config-printer-de.po-typo.patch 
	system-config-printer-editable-ppd.patch 
	system-config-printer-fetchdevices.patch 
	system-config-printer-find-return-accel.patch 
	system-config-printer-gpk-traceback.patch 
	system-config-printer-iconify.patch 
	system-config-printer-install-foomatic-db-ppds.patch 
	system-config-printer-jobs-window-visibility.patch 
	system-config-printer-markers-display.patch 
	system-config-printer-missing-import.patch 
	system-config-printer-network-model.patch 
	system-config-printer-no-cancel-properties-dialog.patch 
	system-config-printer-notification-traceback.patch 
	system-config-printer-physdev-traceback.patch 
	system-config-printer-publish-printers.patch 
	system-config-printer-strip-zjs.patch 
	system-config-printer-strip-zxs-pcl3.patch 
	system-config-printer-test-page-traceback.patch 
	system-config-printer-troubleshoot-network-printers.patch 
Log Message:
* Fri Nov 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.14-1
- 1.1.14:
  - Retry when reconnection fails (bug #541741).
  - Prevent traceback with bad marker-levels attribute (bug #541882).

--- NEW FILE system-config-printer-1.1.14.tar.xz.sig ---
ˆ?

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/.cvsignore,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- .cvsignore	14 Sep 2009 15:07:13 -0000	1.206
+++ .cvsignore	27 Nov 2009 18:02:25 -0000	1.207
@@ -205,3 +205,4 @@ system-config-printer-1.1.10.tar.bz2
 system-config-printer-1.1.11.tar.xz
 system-config-printer-1.1.12.tar.xz
 system-config-printer-1.1.13.tar.xz
+system-config-printer-1.1.14.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/sources,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- sources	14 Sep 2009 15:07:14 -0000	1.212
+++ sources	27 Nov 2009 18:02:25 -0000	1.213
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-15fec6e2bb9543aa42bf86814855f25c  system-config-printer-1.1.13.tar.xz
+71c114e997ec0f8d146f3c6586de032e  system-config-printer-1.1.14.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.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- system-config-printer.spec	26 Nov 2009 16:33:16 -0000	1.317
+++ system-config-printer.spec	27 Nov 2009 18:02:26 -0000	1.318
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.13
-Release: 12%{?dist}
+Version: 1.1.14
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,31 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch1: system-config-printer-data-button-state.patch
-Patch2: system-config-printer-cancel-traceback.patch
-Patch3: system-config-printer-publish-printers.patch
-Patch4: system-config-printer-iconify.patch
-Patch5: system-config-printer-fetchdevices.patch
-Patch6: system-config-printer-missing-import.patch
-Patch7: system-config-printer-find-return-accel.patch
-Patch8: system-config-printer-physdev-traceback.patch
-Patch9: system-config-printer-autoselect-raw.patch
-Patch10: system-config-printer-network-model.patch
-Patch11: system-config-printer-no-cancel-properties-dialog.patch
-Patch12: system-config-printer-jobs-window-visibility.patch
-Patch13: system-config-printer-strip-zxs-pcl3.patch
-Patch14: system-config-printer-troubleshoot-network-printers.patch
-Patch15: system-config-printer-strip-zjs.patch
-Patch16: system-config-printer-custom-state-reasons.patch
-Patch17: system-config-printer-no-epydoc.patch
-Patch18: system-config-printer-notification-traceback.patch
-Patch19: system-config-printer-de.po-typo.patch
-Patch20: system-config-printer-test-page-traceback.patch
-Patch21: system-config-printer-install-foomatic-db-ppds.patch
-Patch22: system-config-printer-gpk-traceback.patch
-Patch23: system-config-printer-editable-ppd.patch
-Patch24: system-config-printer-center.patch
-Patch25: system-config-printer-markers-display.patch
+Patch1: system-config-printer-no-epydoc.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -99,31 +75,7 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .data-button-state
-%patch2 -p1 -b .cancel-traceback
-%patch3 -p1 -b .publish-printers
-%patch4 -p1 -b .iconify
-%patch5 -p1 -b .fetchdevices
-%patch6 -p1 -b .missing-import
-%patch7 -p1 -b .find-return-accel
-%patch8 -p1 -b .physdev-traceback
-%patch9 -p1 -b .autoselect-raw
-%patch10 -p1 -b .network-model
-%patch11 -p1 -b .no-cancel-properties-dialog
-%patch12 -p1 -b .jobs-window-visibility
-%patch13 -p1 -b .strip-zxs-pcl3
-%patch14 -p1 -b .troubleshoot-network-printers
-%patch15 -p1 -b .strip-zjs
-%patch16 -p1 -b .custom-state-reasons
-%patch17 -p1 -b .no-epydoc
-%patch18 -p1 -b .notification-traceback
-%patch19 -p1 -b .de.po-typo
-%patch20 -p1 -b .test-page-traceback
-%patch21 -p1 -b .install-foomatic-db-ppds
-%patch22 -p1 -b .gpk-traceback
-%patch23 -p1 -b .editable-ppd
-%patch24 -p1 -b .center
-%patch25 -p1 -b .markers-display
+%patch1 -p1 -b .no-epydoc
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -176,8 +128,8 @@ rm -rf %buildroot
 
 %files udev
 %defattr(-,root,root,-)
-%{_sysconfdir}/udev/rules.d/*.rules
-/lib/udev/*
+/lib/udev/rules.d/*.rules
+/lib/udev/udev-*-printer
 %dir %{_localstatedir}/run/udev-configure-printer
 %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
 
@@ -194,6 +146,7 @@ rm -rf %buildroot
 %{_datadir}/%{name}/cupspk.py*
 %{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/errordialogs.py*
+%{_datadir}/%{name}/firewall.py*
 %{_datadir}/%{name}/glade.py*
 %{_datadir}/%{name}/GroupsPane.py*
 %{_datadir}/%{name}/GroupsPaneModel.py*
@@ -235,6 +188,11 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Nov 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.14-1
+- 1.1.14:
+  - Retry when reconnection fails (bug #541741).
+  - Prevent traceback with bad marker-levels attribute (bug #541882).
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-12
 - Prevent display of marker levels from making the properties dialog
   too big (bug #540826).


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


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


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


--- system-config-printer-center.patch DELETED ---


--- system-config-printer-custom-state-reasons.patch DELETED ---


--- system-config-printer-data-button-state.patch DELETED ---


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


--- system-config-printer-editable-ppd.patch DELETED ---


--- system-config-printer-fetchdevices.patch DELETED ---


--- system-config-printer-find-return-accel.patch DELETED ---


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


--- system-config-printer-iconify.patch DELETED ---


--- system-config-printer-install-foomatic-db-ppds.patch DELETED ---


--- system-config-printer-jobs-window-visibility.patch DELETED ---


--- system-config-printer-markers-display.patch DELETED ---


--- system-config-printer-missing-import.patch DELETED ---


--- system-config-printer-network-model.patch DELETED ---


--- system-config-printer-no-cancel-properties-dialog.patch DELETED ---


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


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


--- system-config-printer-publish-printers.patch DELETED ---


--- system-config-printer-strip-zjs.patch DELETED ---


--- system-config-printer-strip-zxs-pcl3.patch DELETED ---


--- system-config-printer-test-page-traceback.patch DELETED ---


--- system-config-printer-troubleshoot-network-printers.patch DELETED ---


