From 94e288eba451b0ab562aab57a372a1675328bc38 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 17 Jan 2011 17:59:39 +0100 Subject: [PATCH] 1.2.96: --- .gitignore | 1 + pycups-1.9.51.tar.bz2.sig | Bin 65 -> 0 bytes pysmbc-1.0.9.tar.bz2.asc | 7 ------ sources | 2 +- system-config-printer-1.2.95.tar.xz.sig | Bin 65 -> 0 bytes system-config-printer-1.2.96.tar.xz.sig | Bin 0 -> 65 bytes ...config-printer-attach-to-status-icon.patch | 23 ------------------ system-config-printer-compiz-rename.patch | 11 --------- system-config-printer.spec | 18 ++++++++------ 9 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 pycups-1.9.51.tar.bz2.sig delete mode 100644 pysmbc-1.0.9.tar.bz2.asc delete mode 100644 system-config-printer-1.2.95.tar.xz.sig create mode 100644 system-config-printer-1.2.96.tar.xz.sig delete mode 100644 system-config-printer-attach-to-status-icon.patch delete mode 100644 system-config-printer-compiz-rename.patch diff --git a/.gitignore b/.gitignore index bd2fe06..1249deb 100644 --- a/.gitignore +++ b/.gitignore @@ -226,3 +226,4 @@ pycups-1.9.51.tar.bz2 /system-config-printer-1.2.4.tar.xz /system-config-printer-1.2.5.tar.xz /system-config-printer-1.2.95.tar.xz +/system-config-printer-1.2.96.tar.xz diff --git a/pycups-1.9.51.tar.bz2.sig b/pycups-1.9.51.tar.bz2.sig deleted file mode 100644 index 9909a50785ffc29eb591a948c0a12b923ca46123..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-OeDzZ1hg7`no8Q&5dx+g0HB1Bng(SwkHSzd3sBhUPc)2`2dVyN XL(2&xk<;7R>$D&|S0Gp19P^2MT;&`_ literal 0 HcmV?d00001 diff --git a/system-config-printer-attach-to-status-icon.patch b/system-config-printer-attach-to-status-icon.patch deleted file mode 100644 index 8bd1997..0000000 --- a/system-config-printer-attach-to-status-icon.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up system-config-printer-1.2.95/jobviewer.py.attach-to-status-icon system-config-printer-1.2.95/jobviewer.py ---- system-config-printer-1.2.95/jobviewer.py.attach-to-status-icon 2010-11-24 17:26:25.000000000 +0000 -+++ system-config-printer-1.2.95/jobviewer.py 2010-11-30 13:07:10.328607041 +0000 -@@ -1673,9 +1673,6 @@ class JobViewer (GtkGUI): - self.on_state_reason_notification_closed) - self.state_reason_notifications[reason.get_tuple ()] = notification - self.set_statusicon_visibility () -- if not self.notify_has_persistence: -- notification.attach_to_status_icon (self.statusicon) -- - try: - notification.show () - except gobject.GError: -@@ -1731,9 +1728,6 @@ class JobViewer (GtkGUI): - notification.set_data ('jobid', jobid) - self.completed_job_notifications[jobid] = notification - self.set_statusicon_visibility () -- if not self.notify_has_persistence: -- notification.attach_to_status_icon (self.statusicon) -- - try: - notification.show () - except gobject.GError: diff --git a/system-config-printer-compiz-rename.patch b/system-config-printer-compiz-rename.patch deleted file mode 100644 index 97d95b9..0000000 --- a/system-config-printer-compiz-rename.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up system-config-printer-1.2.5/system-config-printer.py.compiz-rename system-config-printer-1.2.5/system-config-printer.py ---- system-config-printer-1.2.5/system-config-printer.py.compiz-rename 2010-12-02 16:15:00.656238304 +0000 -+++ system-config-printer-1.2.5/system-config-printer.py 2010-12-02 16:15:13.265702866 +0000 -@@ -3076,6 +3076,7 @@ class GUI(GtkGUI, monitor.Watcher): - ids.append (cell.connect ('editing-canceled', - self.printer_name_edit_cancel)) - self.rename_sigids = ids -+ self.dests_iconview.grab_focus () - - def printer_name_edited (self, cell, path, newname): - newname = newname.replace("/", "") diff --git a/system-config-printer.spec b/system-config-printer.spec index 0901166..823f703 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -4,14 +4,12 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.2.95 -Release: 4%{?dist} +Version: 1.2.96 +Release: 1%{?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-attach-to-status-icon.patch -Patch2: system-config-printer-compiz-rename.patch BuildRequires: cups-devel >= 1.2 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: gettext-devel @@ -67,8 +65,6 @@ printers. %prep %setup -q -%patch1 -p1 -b .attach-to-status-icon -%patch2 -p1 -b .compiz-rename %build %configure --with-udev-rules @@ -168,7 +164,7 @@ rm -rf %buildroot %{_datadir}/%{name}/xml/*.rng %{_datadir}/%{name}/xml/validate.py* %dir %{_datadir}/%{name}/ui -%{_datadir}/%{name}/ui/*.glade +%{_datadir}/%{name}/ui/*.ui %{_datadir}/applications/system-config-printer.desktop %{_sysconfdir}/xdg/autostart/print-applet.desktop %{_mandir}/man1/* @@ -178,6 +174,14 @@ rm -rf %buildroot exit 0 %changelog +* Mon Jan 17 2011 Jiri Popelka 1.2.96-1 +- 1.2.96: + - Remove reference to current printer on exit (bug #556548). + - Handle cups.Connection() failure in PrinterURIIndexr (bug #648014). + - Block unwanted characters when editing queue name (bug #658550). + - Initialise D-Bus threading in timedops module (bug #662047). + - many other fixes + * Thu Dec 2 2010 Tim Waugh - 1.2.95-4 - Grab focus on the IconView after setting it editable (bug #650995).