pool/ebtables
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544654 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/544654
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=45
This commit is contained in:
Kristyna Streitova 2017-11-24 16:53:08 +00:00 committed by Git OBS Bridge
parent 9e67edcc73
commit ee744d5249
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebtables.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:37:47 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 23 15:14:46 UTC 2017 - kstreitova@suse.com Thu Mar 23 15:14:46 UTC 2017 - kstreitova@suse.com

19
ebtables.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: ebtables Name: ebtables
Version: 2.0.10.4 Version: 2.0.10.4
Release: 0 Release: 0
@ -92,16 +97,16 @@ make \
INITDIR="%{_sysconfdir}/init.d" \ INITDIR="%{_sysconfdir}/init.d" \
SYSCONFIGDIR="%{_sysconfdir}" \ SYSCONFIGDIR="%{_sysconfdir}" \
install install
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -p %{SOURCE1} %{buildroot}%{_unitdir}/ install -p %{SOURCE1} %{buildroot}%{_unitdir}/
chmod -x %{buildroot}%{_unitdir}/*.service chmod -x %{buildroot}%{_unitdir}/*.service
mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_libexecdir}
install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.filter
touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.nat
touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.broute
rm -rf %{buildroot}%{_initrddir} rm -rf %{buildroot}%{_initrddir}
# not used # not used
rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config" rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
@ -126,9 +131,9 @@ rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
%config(noreplace) %{_sysconfdir}/ethertypes %config(noreplace) %{_sysconfdir}/ethertypes
%{_libexecdir}/%{name} %{_libexecdir}/%{name}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter %ghost %{_fillupdir}/sysconfig.%{name}.filter
%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat %ghost %{_fillupdir}/sysconfig.%{name}.nat
%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute %ghost %{_fillupdir}/sysconfig.%{name}.broute
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.so
%{_sbindir}/ebtables %{_sbindir}/ebtables