[firewalld: 2/2] Merge branch 'f18'

[Jiří Popelka]

commit 241828c9722b27155473344b19af0c7b95d32ac0
Merge: 1fc1c98 d79f3b3
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Mar 7 10:54:22 2013 +0100

    Merge branch 'f18'

 firewalld-0.2.12-bz912782_2.patch |   72 +++++++++++++++++++++++++++++++++++++
 firewalld.spec                    |    7 +++-
 2 files changed, 78 insertions(+), 1 deletions(-)
---
diff --cc firewalld.spec
index 1657549,4b6bff5..93f06c5
--- a/firewalld.spec
+++ b/firewalld.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A firewall daemon with D-BUS interface providing a dynamic firewall
  Name: firewalld
  Version: 0.2.12
--Release: 4%{?dist}
++Release: 5%{?dist}
  URL: http://fedorahosted.org/firewalld
  License: GPLv2+
  ExclusiveOS: Linux
@@@ -198,12 -200,12 +200,15 @@@ f
  %{_datadir}/icons/hicolor/*/apps/firewall-config*.*
  
  %changelog
 -* Thu Mar 07 2013 Jiri Popelka <jpopelka at redhat.com> - 0.2.12-4
++* Thu Mar 07 2013 Jiri Popelka <jpopelka at redhat.com> - 0.2.12-5
+ - Another fix for RHBZ#912782
+ 
 -* Wed Feb 20 2013 Jiri Popelka <jpopelka at redhat.com> - 0.2.12-3
 +* Wed Feb 20 2013 Jiri Popelka <jpopelka at redhat.com> - 0.2.12-4
  - Stop default zone rules being applied to all zones (RHBZ#912782)
  
 +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.12-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Tue Jan 22 2013 Jiri Popelka <jpopelka at redhat.com> - 0.2.12-2
  - Default zone in firewalld.conf was reseted with every restart (RHBZ#902845)
  - Add icon cache related scriptlets for firewall-config (RHBZ#902680)