rpms/firewalld
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use VARIANT_ID for decisions instead of VARIANT

Browse Source
This commit is contained in:
Stephen Gallagher 2015-05-07 10:38:56 -04:00
parent 07c43f280d
commit d651ec2e2c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firewalld.spec
View File

@ -8,7 +8,7 @@
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
Name: firewalld Name: firewalld
Version: 0.3.13 Version: 0.3.13
Release: 6%{?dist} Release: 7%{?dist}
URL: http://www.firewalld.org URL: http://www.firewalld.org
License: GPLv2+ License: GPLv2+
Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 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 # Import /etc/os-release to get the variant definition
. /etc/os-release || : . /etc/os-release || :
case "$VARIANT" in case "$VARIANT_ID" in
Server) server)
ln -sf firewalld-server.conf %{_sysconfdir}/firewalld/firewalld.conf || : ln -sf firewalld-server.conf %{_sysconfdir}/firewalld/firewalld.conf || :
ln -sf org.fedoraproject.FirewallD1.server.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || : 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 firewalld-workstation.conf %{_sysconfdir}/firewalld/firewalld.conf || :
ln -sf org.fedoraproject.FirewallD1.desktop.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || : 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* %{_mandir}/man1/firewall-config*.1*
%changelog %changelog
* Thu May 07 2015 Stephen Gallagher <sgallagh@redhat.com> 0.3.13-7
- Use VARIANT_ID instead of VARIANT for making decisions
* Thu Apr 16 2015 Stephen Gallagher <sgallagh@redhat.com> 0.3.13-6 * Thu Apr 16 2015 Stephen Gallagher <sgallagh@redhat.com> 0.3.13-6
- Switch to using $VARIANT directly from /etc/os-release - Switch to using $VARIANT directly from /etc/os-release