Merge pull request #368 from sysrich/master

Replace references to /var/adm/fillup-templates with new %_fillupdir …
yast · Nov 30, 2017 · 19b0f7e · 19b0f7e
2 parents b935763 + efec734
commit 19b0f7e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 30 06:38:15 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+  %_fillupdir macro (boo#1069468).
+- 4.0.10
+
 -------------------------------------------------------------------
 Wed Nov 29 15:45:54 CET 2017 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -16,8 +16,13 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:           autoyast2
-Version:        4.0.9
+Version:        4.0.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -212,7 +217,7 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 
 # additional files
 
-/var/adm/fillup-templates/sysconfig.autoinstall
+%{_fillupdir}/sysconfig.autoinstall
 
 %files installation
 %defattr(-,root,root)