Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2018-01-16 09:32:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump" Tue Jan 16 09:32:56 2018 rev:91 rq:562913 version:0.8.16 Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2017-12-08 21:47:44.142172193 +0100 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2018-01-16 09:32:57.692109982 +0100 @@ -1,0 +2,12 @@ +Mon Nov 27 15:23:36 UTC 2017 - [email protected] + +- Add kdump-fillupdir-fixes.patch and correct specfile to build + with new fillupdir location + +------------------------------------------------------------------- +Thu Nov 23 13:51:22 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- New: ---- kdump-fillupdir-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.8tOWOz/_old 2018-01-16 09:32:59.700016036 +0100 +++ /var/tmp/diff_new_pack.8tOWOz/_new 2018-01-16 09:32:59.708015662 +0100 @@ -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 @@ 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 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%if 0%{?suse_version} >= 1330 +%patch29 -p1 +%endif %build export CFLAGS="%{optflags}" @@ -182,7 +191,7 @@ # 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 @@ %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 @@ %{_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 ++++++ kdump-fillupdir-fixes.patch ++++++ 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(
