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

[Jiří Popelka]

commit 9ad97721591d43a6838a341a69ff518f9845dec3
Merge: 1e43ccc 1c3b179
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Aug 27 10:40:58 2014 +0200

    Merge branch 'f20' into f21

 firewalld.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc firewalld.spec
index 8cf449d,1dd3ba3..950f4dc
--- a/firewalld.spec
+++ b/firewalld.spec
@@@ -299,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
+ * Wed Aug 27 2014 Jiri Popelka <jpopelka at redhat.com> - 0.3.11-3
+ - Quiet systemctl if cups-browsed.service is not installed
+ 
  * Mon Aug 25 2014 Jiri Popelka <jpopelka at redhat.com> - 0.3.11-2
  - add few Requires to spec (RHBZ#1133167)