diff --git a/firewalld.spec b/firewalld.spec index 768def8..dd68063 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -8,7 +8,7 @@ Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 0.3.13 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 @@ -203,12 +203,12 @@ if [ ! -e %{_sysconfdir}/firewalld/firewalld.conf ]; then # Import /etc/os-release to get the variant definition . /etc/os-release || : - case "$VARIANT" in - Server) + case "$VARIANT_ID" in + server) ln -sf firewalld-server.conf %{_sysconfdir}/firewalld/firewalld.conf || : ln -sf org.fedoraproject.FirewallD1.server.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || : ;; - Workstation) + workstation) ln -sf firewalld-workstation.conf %{_sysconfdir}/firewalld/firewalld.conf || : ln -sf org.fedoraproject.FirewallD1.desktop.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || : ;; @@ -346,6 +346,9 @@ fi %{_mandir}/man1/firewall-config*.1* %changelog +* Thu May 07 2015 Stephen Gallagher 0.3.13-7 +- Use VARIANT_ID instead of VARIANT for making decisions + * Thu Apr 16 2015 Stephen Gallagher 0.3.13-6 - Switch to using $VARIANT directly from /etc/os-release