[firewalld/f21: 2/2] Merge branch 'f20' into f21

[Jiří Popelka]

commit c1a852fecb27b010a30f3df892f2c985c45fbe2e
Merge: 8b10fa9 b42d00a
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Aug 25 12:15:24 2014 +0200

    Merge branch 'f20' into f21

 firewalld.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc firewalld.spec
index a298735,dc8705b..59182e6
--- a/firewalld.spec
+++ b/firewalld.spec
@@@ -296,24 -191,10 +299,27 @@@ f
  %{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
  %{_mandir}/man1/firewall-config*.1*
  
 +%if 0%{?fedora} > 20
 +%files config-standard
 +%config(noreplace) %{_sysconfdir}/firewalld/firewalld-standard.conf
 +%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 +
 +%files config-server
 +%config(noreplace) %{_sysconfdir}/firewalld/firewalld-server.conf
 +%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 +
 +%files config-workstation
 +%config(noreplace) %{_sysconfdir}/firewalld/firewalld-workstation.conf
 +%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 +%endif
 +
  %changelog
+ * Mon Aug 25 2014 Jiri Popelka <jpopelka at redhat.com> - 0.3.11-2
+ - add few Requires to spec (RHBZ#1133167)
+ 
  * Wed Aug 20 2014 Jiri Popelka <jpopelka at redhat.com> - 0.3.11-1
  - firewalld:
    - improve error messages