Accepting request 554601 from home:michals

- Add kdump-fillupdir-fixes.patch and correct specfile to build
  with new fillupdir location

- Replace references to /var/adm/fillup-templates with new 
  %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/554601
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=142

kdump-fillupdir-fixes.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77205e1..3032d3d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,7 +182,7 @@ ADD_CUSTOM_TARGET(
+ INSTALL(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/sysconfig.kdump
+     DESTINATION
+-        /var/adm/fillup-templates/
++        /usr/share/fillup-templates/
+ )
+ 
+ ADD_CUSTOM_COMMAND(

kdump.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 27 15:23:36 UTC 2017 - rbrown@suse.com
+
+- Add kdump-fillupdir-fixes.patch and correct specfile to build
+  with new fillupdir location
+
+-------------------------------------------------------------------
+Thu Nov 23 13:51:22 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Nov 15 12:25:57 UTC 2017 - msuchanek@suse.com
 

kdump.spec

@@ -18,6 +18,11 @@
 
 # on systemd distros, rpm-build requires systemd-rpm-macros,
 # which in turn defines %systemd_requires
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define systemd_present %{defined systemd_requires}
 
 %define dracutlibdir %{_prefix}/lib/dracut
@@ -70,6 +75,7 @@ Patch25:        %{name}-activate-QETH-devices.patch
 Patch26:        %{name}-Dont-exit-even-if-initrd-is-not-built.patch
 Patch27:        %{name}-Limit-kdump-cpus-to-number-provided-by-config.patch
 Patch28:        %{name}-Don-t-split-by-default.patch
+Patch29:        %{name}-fillupdir-fixes.patch
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -158,6 +164,9 @@ cp %{S:1} tests/data/
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%if 0%{?suse_version} >= 1330
+%patch29 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags}"
@@ -182,7 +191,7 @@ mv %{buildroot}/%{_sysconfdir}/udev/rules.d/* %{buildroot}/%{_udevrulesdir}/
 # remove executable bit from non-binaries
 chmod -x %{buildroot}/lib/kdump/setup-kdump.functions
 # empty directory
-mkdir %{buildroot}/var/crash
+mkdir -p %{buildroot}/var/crash
 %if 0%{?suse_version} > 1310
 rm -r %{buildroot}/lib/mkinitrd
 %endif
@@ -205,7 +214,7 @@ ln -s ../..%{_initddir}/boot.kdump %{buildroot}%{_sbindir}/rckdump
 
 %post
 # change only permission if the file exists before /etc/sysconfig/kdump
-# has been created from /var/adm/fillup-templates/sysconfig.kdump
+# has been created from %{_fillupdir}/sysconfig.kdump
 change_permission=0
 if [ ! -f %{_sysconfdir}/sysconfig/kdump ] ; then
     change_permission=1
@@ -258,7 +267,7 @@ rm /var/log/dump >/dev/null 2>&1 || true
 %{_mandir}/man7/kdump.7%{ext_man}
 %{_mandir}/man8/kdumptool.8%{ext_man}
 %{_mandir}/man8/mkdumprd.8%{ext_man}
-%{_localstatedir}/adm/fillup-templates/sysconfig.kdump
+%{_fillupdir}/sysconfig.kdump
 %if 0%{?suse_version} <= 1310
 /lib/mkinitrd/scripts/*-kdump.sh
 /lib/mkinitrd/scripts/setup-kdumpfs.sh