rpm/firewalld
SHA256
1
0
Fork 0
forked from pool/firewalld
Code Pull Requests Activity

Accepting request 544655 from home:RBrownSUSE:branches:security:netfilter

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544655
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=53
This commit is contained in:
Markos Chandras 2017-11-28 12:33:13 +00:00 committed by Git OBS Bridge
parent e6eedc3e69
commit 53da81f4b3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firewalld.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:37:50 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Sun Nov 19 18:37:31 UTC 2017 - mpluskal@suse.com

9
firewalld.spec
View File

@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
Name: firewalld
Version: 0.4.4.6
Release: 0
@ -120,7 +125,7 @@ desktop-file-install --delete-original \
%{buildroot}%{_datadir}/applications/firewall-config.desktop
# fillup_only will take care of that
%{_bindir}/install -c -D -m 600 %{buildroot}%{_sysconfdir}/sysconfig/firewalld %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%{_bindir}/install -c -D -m 600 %{buildroot}%{_sysconfdir}/sysconfig/firewalld %{buildroot}%{_fillupdir}/sysconfig.%{name}
rm %{buildroot}%{_sysconfdir}/sysconfig/firewalld
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcfirewalld
@ -204,7 +209,7 @@ fi
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/helpers
%{_unitdir}/firewalld.service
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%{_fillupdir}/sysconfig.%{name}
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
%attr(0755,root,root) %dir %{python3_sitelib}/firewall
%{_datadir}/firewalld/__pycache__