diff --git a/.gitignore b/.gitignore index a5aa5c2..e255fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,4 @@ pycups-1.9.51.tar.bz2 /system-config-printer-1.3.9.tar.xz /system-config-printer-1.3.10.tar.xz /system-config-printer-1.3.11.tar.xz +/system-config-printer-1.3.12.tar.xz diff --git a/sources b/sources index 16ad91c..a2ef96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -081fde89686ee15a9433c0035f5faed0 system-config-printer-1.3.11.tar.xz +0775647e1c34ef25364de3c178a4ed36 system-config-printer-1.3.12.tar.xz diff --git a/system-config-printer-1.3.11.tar.xz.sig b/system-config-printer-1.3.11.tar.xz.sig deleted file mode 100644 index bfbbc82..0000000 Binary files a/system-config-printer-1.3.11.tar.xz.sig and /dev/null differ diff --git a/system-config-printer-1.3.12.tar.xz.sig b/system-config-printer-1.3.12.tar.xz.sig new file mode 100644 index 0000000..bf9f363 Binary files /dev/null and b/system-config-printer-1.3.12.tar.xz.sig differ diff --git a/system-config-printer-FirewallD.patch b/system-config-printer-FirewallD.patch index e86414f..7149022 100644 --- a/system-config-printer-FirewallD.patch +++ b/system-config-printer-FirewallD.patch @@ -402,15 +402,7 @@ diff -up system-config-printer-1.3.11/serversettings.py.FirewallD system-config- diff -up system-config-printer-1.3.11/system-config-printer.py.FirewallD system-config-printer-1.3.11/system-config-printer.py --- system-config-printer-1.3.11/system-config-printer.py.FirewallD 2012-08-01 17:48:26.000000000 +0200 +++ system-config-printer-1.3.11/system-config-printer.py 2012-09-21 13:34:29.073164365 +0200 -@@ -86,7 +86,6 @@ from serversettings import ServerSetting - from ToolbarSearchEntry import * - from SearchCriterion import * - import statereason --import firewall - import newprinter - from newprinter import busy, ready - import printerproperties -@@ -371,6 +370,7 @@ class GUI(GtkGUI): +@@ -370,6 +370,7 @@ class GUI(GtkGUI): self.newPrinterGUI = np = newprinter.NewPrinterGUI() np.connect ("printer-added", self.on_new_printer_added) np.connect ("printer-modified", self.on_printer_modified) @@ -418,7 +410,7 @@ diff -up system-config-printer-1.3.11/system-config-printer.py.FirewallD system- # Set up "About" dialog self.AboutDialog.set_program_name(config.PACKAGE) -@@ -1729,26 +1729,44 @@ class GUI(GtkGUI): +@@ -1728,26 +1729,44 @@ class GUI(GtkGUI): # == New Printer Dialog ============================================== # ==================================================================== diff --git a/system-config-printer.spec b/system-config-printer.spec index 0b11d97..3aef035 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -1,7 +1,7 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.3.11 -Release: 5%{?dist} +Version: 1.3.12 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -137,7 +137,7 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris %{_prefix}/lib/udev/udev-*-printer %ghost %dir %{_localstatedir}/run/udev-configure-printer %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris -%{_unitdir}/udev-configure-printer.service +%{_unitdir}/configure-printer@.service %files %doc ChangeLog README @@ -166,16 +166,10 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris /bin/rm -f /var/cache/foomatic/foomatic.pickle exit 0 -%post udev -%systemd_post udev-configure-printer.service - -%preun udev -%systemd_preun udev-configure-printer.service - -%postun udev -%systemd_postun_with_restart udev-configure-printer.service - %changelog +* Fri Oct 5 2012 Tim Waugh 1.3.12-1 +- 1.3.12. + * Fri Sep 21 2012 Jiri Popelka 1.3.11-5 - FirewallD support once again (use D-Bus instead of FirewallD client module)