diff --git a/knock.changes b/knock.changes index 0be8899..3eddb9c 100644 --- a/knock.changes +++ b/knock.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:46:18 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Tue Dec 1 14:49:38 UTC 2015 - p.drouand@gmail.com diff --git a/knock.spec b/knock.spec index 47591f1..bd69c95 100644 --- a/knock.spec +++ b/knock.spec @@ -1,7 +1,7 @@ # -# spec file for package spec +# spec file for package knock # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %if 0%{?suse_version} > 1210 %define with_systemd 1 %else @@ -53,7 +59,6 @@ can be used to open up holes in a firewall for quick access. %package -n knockd Summary: A port-knocking server -License: GPL-2.0+ Group: Productivity/Networking/Security %if %{with_systemd} %{?systemd_requires} @@ -88,7 +93,7 @@ install -m 600 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}d.conf install -D -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}/%{name}d.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}d %else -install -m 644 -D %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}d +install -m 644 -D %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name}d install -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}d ln -sf ../..%{_initddir}/%{name}d %{buildroot}%{_sbindir}/rc%{name}d %endif @@ -133,10 +138,10 @@ rm -rf %{buildroot}%{_datadir}/doc %{_unitdir}/%{name}d.service %else %{_sysconfdir}/init.d/%{name}d -%config %{_localstatedir}/adm/fillup-templates/* +%config %{_fillupdir}/* %endif %{_sbindir}/rc%{name}d %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/%{name}d.conf %{_mandir}/man?/%{name}d.* -%changelog \ No newline at end of file +%changelog