- Remove kdump-helpers from Provides. This was needed to allow

upgrading in SLE10, but this distribution is discontinued now.

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

kdump-cmake-compat.patch

@@ -1,22 +1,28 @@
 From: Petr Tesarik <ptesarik@suse.com>
+Date: Wed Oct 5 08:48:38 2016 +0200
 Subject: Avoid using TARGET_* cmake directives
-Patch-mainline: never; compatibility with older SUSE distros
+Upstream: never; compatibility with older SUSE distros
+
+The TARGET_INCLUDE_DIRECTORIES directive was added in cmake 3.0.2.
+It is not recognized by older versions.
 
 This patch can be removed when we stop caring about SLES11...
 
 Signed-off-by: Petr Tesarik <ptesarik@suse.com>
 ---
- init/CMakeLists.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ init/CMakeLists.txt |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- a/init/CMakeLists.txt
 +++ b/init/CMakeLists.txt
-@@ -20,7 +20,7 @@
+@@ -20,8 +20,8 @@
  ADD_EXECUTABLE(device-timeout-generator
      device-timeout-generator.c
  )
 -TARGET_INCLUDE_DIRECTORIES(device-timeout-generator
-+INCLUDE_DIRECTORIES(device-timeout-generator
-     PUBLIC ${BLKID_INCLUDE_DIRS})
+-    PUBLIC ${BLKID_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(
++    ${BLKID_INCLUDE_DIRS})
  TARGET_LINK_LIBRARIES(device-timeout-generator
      ${BLKID_LIBRARIES})
+ 

kdump.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct  5 13:12:53 UTC 2016 - ptesarik@suse.com
+
+- Remove kdump-helpers from Provides. This was needed to allow
+  upgrading in SLE10, but this distribution is discontinued now.
+
 -------------------------------------------------------------------
 Wed Oct  5 10:55:39 UTC 2016 - ptesarik@suse.com
 

kdump.spec

@@ -16,6 +16,10 @@
 #
 
 
+# on systemd distros, rpm-build requires systemd-rpm-macros,
+# which in turn defines %systemd_requires
+%define systemd_present %{defined systemd_requires}
+
 %define dracutlibdir %{_prefix}/lib/dracut
 
 %{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev)}
@@ -28,12 +32,6 @@
 %endif
 %define _udevrulesdir %{_udevdir}/rules.d
 
-%if 0%{?suse_version} > 1220
-%define uses_systemd 1
-%else
-%define uses_systemd 0
-%endif
-
 Name:           kdump
 Version:        0.8.16
 Release:        0
@@ -66,14 +64,11 @@ PreReq:         sed
 Recommends:     cifs-utils
 Recommends:     nfs-client
 #!BuildIgnore:  fop
-# rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
-Provides:       kdump-helpers = %{version}
-Obsoletes:      kdump-helpers < %{version}
 # update should detect the split-off from kexec-tools
 Provides:       kexec-tools:%{_initddir}/kdump
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 ppc
-%if %{uses_systemd}
+%if %{systemd_present}
 BuildRequires:  systemd
 %endif
 %if 0%{?suse_version} > 1310
@@ -81,7 +76,7 @@ PreReq:         dracut
 %else
 PreReq:         mkinitrd
 %endif
-%if %{uses_systemd}
+%if %{systemd_present}
 %systemd_requires
 %endif
 
@@ -135,7 +130,7 @@ rm -r %{buildroot}/lib/mkinitrd
 %endif
 
 # symlink for init script
-%if %{uses_systemd}
+%if %{systemd_present}
 rm %{buildroot}%{_initddir}/boot.kdump
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckdump
 %else
@@ -144,7 +139,7 @@ rm %{buildroot}/usr/lib/systemd/system/kdump-rebuild-initrd.service
 ln -s ../..%{_initddir}/boot.kdump %{buildroot}%{_sbindir}/rckdump
 %endif
 
-%if %{uses_systemd}
+%if %{systemd_present}
 %pre
 %service_add_pre kdump.service
 %service_add_pre kdump-rebuild-initrd.service
@@ -157,7 +152,7 @@ change_permission=0
 if [ ! -f %{_sysconfdir}/sysconfig/kdump ] ; then
     change_permission=1
 fi
-%if %{uses_systemd}
+%if %{systemd_present}
 %{fillup_only -n kdump}
 %service_add_post kdump.service
 %service_add_post kdump-rebuild-initrd.service
@@ -175,7 +170,7 @@ fi
 
 %preun
 echo "Stopping kdump ..."
-%if %{uses_systemd}
+%if %{systemd_present}
 %service_del_preun kdump.service
 %service_del_preun kdump-rebuild-initrd.service
 %else
@@ -187,7 +182,7 @@ echo "Stopping kdump ..."
 touch %{_sysconfdir}/sysconfig/kdump
 # delete symbolic link
 rm /var/log/dump >/dev/null 2>&1 || true
-%if %{uses_systemd}
+%if %{systemd_present}
 %service_del_postun kdump.service
 %service_del_postun kdump-rebuild-initrd.service
 %else
@@ -217,7 +212,7 @@ rm /var/log/dump >/dev/null 2>&1 || true
 %dir /lib/kdump
 /lib/kdump/*
 %{_udevrulesdir}/70-kdump.rules
-%if %{uses_systemd}
+%if %{systemd_present}
 %{_unitdir}/kdump.service
 %{_unitdir}/kdump-rebuild-initrd.service
 %else