diff --git a/firewalld.spec b/firewalld.spec index d6c8e0a..3845ef9 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -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=FedoraServer|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=FedoraWorkstation|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,9 @@ fi %endif %changelog +* Tue Jul 22 2014 Thomas Woerner - 0.3.10-5 +- Fixed wrong default zone names for server and workstation (RHBZ#1120296) + * 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)