From b4077d3dd0bb1b6afa15489a897165e06ca093c0cef8a94eb2ff1859e610fac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Tue, 28 Jan 2020 22:40:31 +0000 Subject: [PATCH] Accepting request 766903 from home:dimstar:Factory - Use BuildRequire(udev) instead of udev: allow OBS to shortcut through the -mini flavors. - Use systemd_ordering instead of systemd_requires: systemd is not a strict requirement, but if the system is going to use it, we want it to beinstalled prior to kdump. Also fix some rpmlint warnings about unescaped %{} in comments OBS-URL: https://build.opensuse.org/request/show/766903 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=194 --- kdump.changes | 9 +++++++++ kdump.spec | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/kdump.changes b/kdump.changes index 23fb6a9..050df51 100644 --- a/kdump.changes +++ b/kdump.changes @@ -4,6 +4,15 @@ Mon Jan 27 16:35:50 UTC 2020 - Martin Wilck - kdump-activate-udev-rules-late-during-boot.patch: Activate kdump udev rules late during boot (bsc#1154837) +------------------------------------------------------------------- +Fri Jan 24 13:45:05 UTC 2020 - Dominique Leuenberger + +- Use BuildRequire(udev) instead of udev: allow OBS to shortcut + through the -mini flavors. +- Use systemd_ordering instead of systemd_requires: systemd is not + a strict requirement, but if the system is going to use it, we + want it to beinstalled prior to kdump. + ------------------------------------------------------------------- Tue Dec 17 10:00:30 UTC 2019 - Petr Tesařík diff --git a/kdump.spec b/kdump.spec index e0492e9..0895a09 100644 --- a/kdump.spec +++ b/kdump.spec @@ -17,7 +17,7 @@ # on systemd distros, rpm-build requires systemd-rpm-macros, -# which in turn defines %systemd_requires +# which in turn defines %%systemd_requires %define systemd_present %{defined systemd_requires} #Compat macro for new _fillupdir macro introduced in Nov 2017 @@ -77,8 +77,8 @@ BuildRequires: libesmtp-devel BuildRequires: libopenssl-devel BuildRequires: libxslt BuildRequires: pkgconfig -BuildRequires: udev BuildRequires: zlib-devel +BuildRequires: pkgconfig(udev) #!BuildIgnore: fop Requires: curl Requires: kexec-tools @@ -101,7 +101,7 @@ BuildRequires: pkgconfig(systemd) PreReq: %insserv_prereq %endif %if %{systemd_present} -%systemd_requires +%systemd_ordering %endif %description @@ -194,7 +194,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 %{_fillupdir}/sysconfig.kdump +# has been created from %%{_fillupdir}/sysconfig.kdump change_permission=0 if [ ! -f %{_sysconfdir}/sysconfig/kdump ] ; then change_permission=1 @@ -242,7 +242,7 @@ rm %{_localstatedir}/log/dump >/dev/null 2>&1 || true %endif # Compatibility cruft -# there is no %license prior to SLE12 +# there is no %%license prior to SLE12 %if %{undefined _defaultlicensedir} %define license %doc %else