From 3bcc74d62620fec22b31bca27dc5e5b4fa3fb07e Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Tue, 8 Jul 2014 13:39:14 +0200 Subject: [PATCH] - renamed fedora specific zones to FedoraServer and FedoraWorkstation for zone name limitations (length and allowed chars) --- fedora-server.xml => FedoraServer.xml | 0 ...ra-workstation.xml => FedoraWorkstation.xml | 0 firewalld.spec | 18 +++++++++++------- 3 files changed, 11 insertions(+), 7 deletions(-) rename fedora-server.xml => FedoraServer.xml (100%) rename fedora-workstation.xml => FedoraWorkstation.xml (100%) diff --git a/fedora-server.xml b/FedoraServer.xml similarity index 100% rename from fedora-server.xml rename to FedoraServer.xml diff --git a/fedora-workstation.xml b/FedoraWorkstation.xml similarity index 100% rename from fedora-workstation.xml rename to FedoraWorkstation.xml diff --git a/firewalld.spec b/firewalld.spec index 0f58e80..d6c8e0a 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,13 +1,13 @@ Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 0.3.10 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://fedorahosted.org/firewalld License: GPLv2+ Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 %if 0%{?fedora} -Source1: fedora-server.xml -Source2: fedora-workstation.xml +Source1: FedoraServer.xml +Source2: FedoraWorkstation.xml Patch0: firewalld-0.2.6-MDNS-default.patch %endif BuildArch: noarch @@ -111,8 +111,8 @@ desktop-file-install --delete-original \ %{buildroot}%{_datadir}/applications/firewall-config.desktop install -d -m 755 %{buildroot}%{_prefix}/lib/firewalld/zones/ -install -c -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/fedora-server.xml -install -c -m 644 %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/zones/fedora-workstation.xml +install -c -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/FedoraServer.xml +install -c -m 644 %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/zones/FedoraWorkstation.xml %if 0%{?fedora} > 20 # standard firewalld.conf @@ -122,13 +122,13 @@ mv %{buildroot}%{_sysconfdir}/firewalld/firewalld.conf \ # server firewalld.conf cp -a %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf \ %{buildroot}%{_sysconfdir}/firewalld/firewalld-server.conf -sed -i 's|^DefaultZone=*|DefaultZone=fedora-server|g' \ +sed -i 's|^DefaultZone=*|DefaultZone=FedoraServer|g' \ %{buildroot}%{_sysconfdir}/firewalld/firewalld-server.conf # workstation firewalld.conf cp -a %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf \ %{buildroot}%{_sysconfdir}/firewalld/firewalld-workstation.conf -sed -i 's|^DefaultZone=*|DefaultZone=fedora-workstation|g' \ +sed -i 's|^DefaultZone=*|DefaultZone=FedoraWorkstation|g' \ %{buildroot}%{_sysconfdir}/firewalld/firewalld-workstation.conf rm -f %{buildroot}%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy @@ -300,6 +300,10 @@ fi %endif %changelog +* Tue Jul 8 2014 Thomas Woerner - 0.3.10-4 +- renamed fedora specific zones to FedoraServer and FedoraWorkstation for + zone name limitations (length and allowed chars) + * Mon Jul 7 2014 Thomas Woerner - 0.3.10-3 - New support for Fedora per-product configuration settings for Fedora.next https://fedoraproject.org/wiki/Per-Product_Configuration_Packaging_Draft