SHA256
1
0
forked from pool/kdump

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
This commit is contained in:
Petr Tesařík 2020-01-28 22:40:31 +00:00 committed by Git OBS Bridge
parent 807780d965
commit b4077d3dd0
2 changed files with 14 additions and 5 deletions

View File

@ -4,6 +4,15 @@ Mon Jan 27 16:35:50 UTC 2020 - Martin Wilck <mwilck@suse.com>
- 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 <dimstar@opensuse.org>
- 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 <ptesarik@suse.com>

View File

@ -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