From ecdf399bdca4c5538398d2639e4b16ffbd12a322 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 7 Aug 2012 13:25:11 +0200
Subject: [PATCH] New version 0.2.6

- New D-BUS interface for persistent configuration
- Aded support for persistent zone configuration in firewall-cmd
- New Shields Up feature in firewall-applet
- New requirements for python-decorator and pygobject3
- New firewall-config sub-package
- New firewall-convert-scfw-config config script
---
 .gitignore     |  1 +
 firewalld.spec | 61 ++++++++++++++++++++++++++++++--------------------
 sources        |  2 +-
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0817a2e..7482c50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /firewalld-0.2.3.tar.bz2
 /firewalld-0.2.4.tar.bz2
 /firewalld-0.2.5.tar.bz2
+/firewalld-0.2.6.tar.bz2
diff --git a/firewalld.spec b/firewalld.spec
index 6b6ec46..b9f9866 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -2,8 +2,8 @@
 
 Summary: A firewall daemon with D-BUS interface providing a dynamic firewall
 Name: firewalld
-Version: 0.2.5
-Release: 2%{?dist}
+Version: 0.2.6
+Release: 1%{?dist}
 URL: http://fedorahosted.org/firewalld
 License: GPLv2+
 ExclusiveOS: Linux
@@ -11,6 +11,7 @@ Group: System Environment/Base
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
+Patch0: firewalld-0.2.6-MDNS-default.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -19,6 +20,8 @@ BuildRequires: glib2, glib2-devel
 BuildRequires: systemd-units
 Requires: dbus-python
 Requires: python-slip-dbus >= 0.2.7
+Requires: python-decorator
+Requires: pygobject3
 Requires: iptables, ebtables
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -35,7 +38,7 @@ firewall with a D-BUS interface.
 Summary: Firewall panel applet
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
-#Requires: firewall-config = %{version}-%{release}
+Requires: firewall-config = %{version}-%{release}
 Requires: hicolor-icon-theme
 Requires: gtk3
 Requires: pygobject3
@@ -44,21 +47,22 @@ Requires: pygobject3
 The firewall panel applet provides a status information of firewalld and also 
 the firewall settings.
 
-#%package -n firewall-config
-#Summary: Firewall configuration application
-#Group: System Environment/Base
-#Requires: %{name} = %{version}-%{release}
-#Requires: hicolor-icon-theme
-#Requires: pygtk2
-#Requires: pygtk2-libglade
-#Requires: gtk2 >= 2.6
-#
-#%description -n firewall-config
-#The firewall configuration application provides an configuration interface for 
-#firewalld.
+%package -n firewall-config
+Summary: Firewall configuration application
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: hicolor-icon-theme
+Requires: pygtk2
+Requires: pygtk2-libglade
+Requires: gtk2 >= 2.6
+
+%description -n firewall-config
+The firewall configuration application provides an configuration interface for 
+firewalld.
 
 %prep
 %setup -q
+%patch0 -p1 # do not create backups
 
 %build
 ./autogen.sh
@@ -72,9 +76,9 @@ make install DESTDIR=%{buildroot}
 desktop-file-install --delete-original \
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/firewall-applet.desktop
-#desktop-file-install --delete-original \
-#  --dir %{buildroot}%{_datadir}/applications \
-#  %{buildroot}%{_datadir}/applications/firewall-config.desktop
+desktop-file-install --delete-original \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{buildroot}%{_datadir}/applications/firewall-config.desktop
 
 %find_lang %{name} --all-name
 
@@ -133,6 +137,7 @@ fi
 %doc COPYING
 %{_sbindir}/firewalld
 %{_bindir}/firewall-cmd
+%{_bindir}/firewall-convert-scfw-config
 %defattr(0640,root,root)
 %attr(0750,root,root) %dir %{_prefix}/lib/firewalld
 %attr(0750,root,root) %dir %{_prefix}/lib/firewalld/icmptypes
@@ -173,16 +178,24 @@ fi
 %{_datadir}/icons/hicolor/*/apps/firewall-applet*.*
 %{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallApplet.gschema.xml
 
-#%files -n firewall-config
-#%defattr(-,root,root)
-#%{_bindir}/firewall-config
-#%defattr(0644,root,root)
+%files -n firewall-config
+%defattr(-,root,root)
+%{_bindir}/firewall-config
+%defattr(0644,root,root)
 #%{_datadir}/firewalld/firewall-config.glade
-#%{_datadir}/applications/firewall-config.desktop
+%{_datadir}/applications/firewall-config.desktop
 #%{_datadir}/icons/hicolor/*/apps/firewall-config*.*
 
 %changelog
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.5-2
+* Tue Aug  7 2012 Thomas Woerner <twoerner@redhat.com> 0.2.6-1
+- New D-BUS interface for persistent configuration
+- Aded support for persistent zone configuration in firewall-cmd
+- New Shields Up feature in firewall-applet
+- New requirements for python-decorator and pygobject3
+- New firewall-config sub-package
+- New firewall-convert-scfw-config config script
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Fri Apr 20 2012 Thomas Woerner <twoerner@redhat.com> 0.2.5-1
diff --git a/sources b/sources
index 894f04d..4569b59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f831d74efb4ca9cdddb0f577079de4ed  firewalld-0.2.5.tar.bz2
+8d3c2e85fa92ba9cf7dd3c0634e7df48  firewalld-0.2.6.tar.bz2