commit openvpn for openSUSE:Factory
Hello community, here is the log from the commit of package openvpn for openSUSE:Factory checked in at 2017-11-25 08:43:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvpn (Old) and /work/SRC/openSUSE:Factory/.openvpn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvpn" Sat Nov 25 08:43:50 2017 rev:79 rq:545137 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/openvpn/openvpn.changes 2017-10-11 23:02:07.986852519 +0200 +++ /work/SRC/openSUSE:Factory/.openvpn.new/openvpn.changes 2017-11-25 08:43:58.399384512 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:52:15 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvpn.spec ++++++ --- /var/tmp/diff_new_pack.lj0pq9/_old 2017-11-25 08:43:59.823332631 +0100 +++ /var/tmp/diff_new_pack.lj0pq9/_new 2017-11-25 08:43:59.827332485 +0100 @@ -16,6 +16,11 @@ # +#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 @@ -194,9 +199,9 @@ install -D -m 755 $RPM_SOURCE_DIR/openvpn.init %{buildroot}/%{_sysconfdir}/init.d/openvpn ln -sv %{_sysconfdir}/init.d/openvpn %{buildroot}/%{_sbindir}/rcopenvpn # the /etc/sysconfig/openvpn template only with sysvinit, no needed with systemd -install -d -m0755 %{buildroot}%{_localstatedir}/adm/fillup-templates +install -d -m0755 %{buildroot}%{_fillupdir} install -m0600 $RPM_SOURCE_DIR/openvpn.sysconfig \ - %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.openvpn + %{buildroot}%{_fillupdir}/sysconfig.openvpn %endif cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE install -m 755 $RPM_SOURCE_DIR/client-netconfig.up sample/sample-scripts/client-netconfig.up @@ -214,7 +219,7 @@ if test ${FIRST_ARG:-$1} -ge 1 -a \ -x /bin/systemctl -a \ -f %{_sysconfdir}/sysconfig/openvpn -a \ - -f %{_localstatedir}/adm/fillup-templates/sysconfig.openvpn && \ + -f %{_fillupdir}/sysconfig.openvpn && \ /bin/systemctl --quiet is-enabled openvpn.service &>/dev/null ; then . %{_sysconfdir}/sysconfig/openvpn @@ -282,7 +287,7 @@ %dir %attr(0750,root,root) %ghost %{_rundir}/openvpn/ %else %config %{_sysconfdir}/init.d/openvpn -%{_localstatedir}/adm/fillup-templates/sysconfig.openvpn +%{_fillupdir}/sysconfig.openvpn %dir %attr(750,root,root) %{_rundir}/openvpn/ %endif %{_sbindir}/rcopenvpn
participants (1)
-
root@hilbert.suse.de