[system-config-printer/f18] revert previous change for now, the patch needs more work

Jiří Popelka jpopelka at fedoraproject.org
Tue Sep 18 16:39:14 UTC 2012


commit 54c67162545a87a7d062c0f2ac8ebb20ba9126dd
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Sep 18 18:37:57 2012 +0200

    revert previous change for now, the patch needs more work

 system-config-printer-FirewallD.patch |  441 ---------------------------------
 system-config-printer.spec            |   11 +-
 2 files changed, 6 insertions(+), 446 deletions(-)
---
diff --git a/system-config-printer.spec b/system-config-printer.spec
index e679931..b3785c8 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,13 +1,13 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.3.11
-Release: 3%{?dist}
+Release: 4%{?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.3/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-no-applet-in-gnome.patch
-Patch2: system-config-printer-FirewallD.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
@@ -63,8 +63,6 @@ printers.
 
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
-# FirewallD support
-%patch2 -p1 -b .FirewallD
 
 %build
 %configure --with-udev-rules
@@ -96,7 +94,7 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/dnssdresolve.py*
 %{_datadir}/%{name}/errordialogs.py*
-%{_datadir}/%{name}/firewallsettings.py*
+%{_datadir}/%{name}/firewall.py*
 %{_datadir}/%{name}/gtkinklevel.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
 %{_datadir}/%{name}/gtkspinner.py*
@@ -174,6 +172,9 @@ exit 0
 %systemd_postun_with_restart udev-configure-printer.service
 
 %changelog
+* Tue Sep 18 2012 Jiri Popelka <jpopelka at redhat.com> 1.3.11-4
+- revert previous change for now, the patch needs more work
+
 * Thu Sep 06 2012 Jiri Popelka <jpopelka at redhat.com> 1.3.11-3
 - FirewallD support
 


More information about the scm-commits mailing list