diff --git a/.cvsignore b/.cvsignore index ee1a9d5..e6fe8d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -217,3 +217,4 @@ system-config-printer-1.1.93.tar.xz pycups-1.9.49.tar.bz2 system-config-printer-1.2.0.tar.xz system-config-printer-1.2.1.tar.xz +system-config-printer-1.2.2.tar.xz diff --git a/sources b/sources index da82021..2ed88c8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ ac8f98a40b0fc4b6ab4470f10489887a pysmbc-1.0.6.tar.bz2 6db9d8bc7f40315bc0b93f210737cc82 pycups-1.9.49.tar.bz2 -c5463ad1b9f81947293521f8152727a1 system-config-printer-1.2.1.tar.xz +b14021236af2d935641c27d214d4923a system-config-printer-1.2.2.tar.xz diff --git a/system-config-printer-1.2.1.tar.xz.sig b/system-config-printer-1.2.1.tar.xz.sig deleted file mode 100644 index 74c7218..0000000 Binary files a/system-config-printer-1.2.1.tar.xz.sig and /dev/null differ diff --git a/system-config-printer-1.2.2.tar.xz.sig b/system-config-printer-1.2.2.tar.xz.sig new file mode 100644 index 0000000..332d415 Binary files /dev/null and b/system-config-printer-1.2.2.tar.xz.sig differ diff --git a/system-config-printer-use-getJobs-requested-attrs.patch b/system-config-printer-use-getJobs-requested-attrs.patch deleted file mode 100644 index f9ec21d..0000000 --- a/system-config-printer-use-getJobs-requested-attrs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up system-config-printer-1.2.1/monitor.py.use-getJobs-requested-attrs system-config-printer-1.2.1/monitor.py ---- system-config-printer-1.2.1/monitor.py.use-getJobs-requested-attrs 2010-04-15 00:11:33.000000000 +0100 -+++ system-config-printer-1.2.1/monitor.py 2010-04-22 16:05:28.493458040 +0100 -@@ -608,11 +608,26 @@ class Monitor: - return False - - limit = 1 -+ r = ["job-id", -+ "job-printer-uri", -+ "job-state", -+ "job-originating-user-name", -+ "job-k-octets", -+ "job-name", -+ "time-at-creation"] - try: -- fetched = c.getJobs (which_jobs=self.which_jobs, -- my_jobs=self.my_jobs, -- first_job_id=self.fetch_first_job_id, -- limit=limit) -+ try: -+ fetched = c.getJobs (which_jobs=self.which_jobs, -+ my_jobs=self.my_jobs, -+ first_job_id=self.fetch_first_job_id, -+ limit=limit, -+ requested_attributes=r) -+ except TypeError: -+ # requested_attributes requires pycups 1.9.50 -+ fetched = c.getJobs (which_jobs=self.which_jobs, -+ my_jobs=self.my_jobs, -+ first_job_id=self.fetch_first_job_id, -+ limit=limit) - except cups.IPPError, (e, m): - self.watcher.cups_ipp_error (self, e, m) - self.fetch_jobs_timer = None diff --git a/system-config-printer.spec b/system-config-printer.spec index a9a3924..98573af 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -6,8 +6,8 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -18,7 +18,6 @@ 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-no-epydoc.patch -Patch2: system-config-printer-use-getJobs-requested-attrs.patch Patch100: system-config-printer-pycups-build.patch Patch101: pycups-add-getJobs-requested-attrs.patch @@ -83,9 +82,6 @@ printers. # Don't require epydoc. %patch1 -p1 -b .no-epydoc -# Specify requested attributes in getJobs if possible (bug #584806). -%patch2 -p1 -b .use-getJobs-requested-attrs.patch - pushd pycups-%{pycups_version} # Fixed pycups build with new distutils. @@ -169,6 +165,7 @@ rm -rf %buildroot %{_datadir}/%{name}/config.py* %{_datadir}/%{name}/cupspk.py* %{_datadir}/%{name}/debug.py* +%{_datadir}/%{name}/dnssdresolve.py* %{_datadir}/%{name}/errordialogs.py* %{_datadir}/%{name}/firewall.py* %{_datadir}/%{name}/GroupsPane.py* @@ -212,6 +209,44 @@ rm -rf %buildroot exit 0 %changelog +* Fri May 7 2010 Tim Waugh - 1.2.2-1 +- Updated to 1.2.2: + - Check we are connected to the local server for server firewall + changes and package installation. + - Avoid Yes/No buttons (trac #204). + - Set gettext domain for new printer dialog (Ubuntu #557199). + - Make sure the printer we are changing the PPD for still exists + and close New Printer window if not (bug #581668). + - Specify requested_attributes in getJobs if possible (bug #584806). + - Resolve DNS-SD hostnames for physical device comparision + (trac #179). + - jobviewer: PrinterURIIndex fix when no initial printer names and + when looking up by name. + - Don't fetch Device ID from network printer if we already know it. + - Applet module no longer needs to import statereason. + - Removed doubled-up 'translatable' attribute in UI file + (Ubuntu #571662). + - Fixed indentation in PK1Connection.getDevices. + - No need to introspect CupsPkHelper every time, just once. + - troubleshoot: turn off debugging before fetching error log. + - Fixed localized state reasons (bug #587718). + - Match Kyocera as manufacturer when only model name reported + (Ubuntu #564633). + - Fixed TreeIter handling in update_job_creation_times (bug #588409). + - Make Verify buttons auto-sized (Ubuntu #575048). + - Fixed a troubleshooter string and some SMB auth dialog strings + that were not being translated (Ubuntu #557199). + - Show unmatched IEEE 1284 Device IDs in less confusing format. + - check-device-ids: run SNMP query for lpd URIs too. + - Handle HTTPError from AdvancedServerSettingsDialog, and treat any + HTTP errors as failures (bug #587744). + - asyncconn/asyncipp: some fixes for connection/reconnection + failures. + - ppdsloader: watch out for errors when connecting. + - Initialise GUI.printers in constructor (bug #589793). + - Always use close_fds=True in subprocess.Popen calls (bug #587830). + - Translation updates. + * Thu Apr 22 2010 Tim Waugh - 1.2.1-2 - Specify requested attributes in getJobs if possible (bug #584806). - Added optional requested_attributes argument to Connection.getJobs