Hello community,

here is the log from the commit of package openscap for openSUSE:Factory 
checked in at 2017-11-24 10:54:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openscap (Old)
 and      /work/SRC/openSUSE:Factory/.openscap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openscap"

Fri Nov 24 10:54:25 2017 rev:53 rq:544846 version:1.2.16

Changes:
--------
--- /work/SRC/openSUSE:Factory/openscap/openscap.changes        2017-11-22 
11:22:21.925476187 +0100
+++ /work/SRC/openSUSE:Factory/.openscap.new/openscap.changes   2017-11-24 
10:54:27.904297035 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:44:24 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openscap.spec ++++++
--- /var/tmp/diff_new_pack.uu11mF/_old  2017-11-24 10:54:29.248247946 +0100
+++ /var/tmp/diff_new_pack.uu11mF/_new  2017-11-24 10:54:29.252247800 +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
+
 %define sover 8
 %define with_bindings 0
 
@@ -187,10 +192,10 @@
 make install DESTDIR=%{buildroot}
 find %{buildroot} -name "*.la" -delete
 
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/oscap-scan
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir}
 
 install -m 644 %{SOURCE3}  $RPM_BUILD_ROOT/%{_datadir}/openscap
 install -m 644 %{SOURCE4}  $RPM_BUILD_ROOT/%{_datadir}/openscap
@@ -290,7 +295,7 @@
 
 %files utils
 %defattr(-,root,root,-)
-/var/adm/fillup-templates/sysconfig.oscap-scan
+%{_fillupdir}/sysconfig.oscap-scan
 %doc docs/oscap-scan.cron
 %{_initrddir}/oscap-scan
 %{_mandir}/man8/*


Reply via email to