From 21a3bb0e38db5a133f6612a85071410ff96ea3d68e4edf6bbb9325c1997b7493 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 4 Oct 2023 16:41:01 +0000 Subject: [PATCH] Accepting request 1115669 from home:jankara:branches:filesystems - Update specfile to make sure regenerate_initrd_post macro is defined OBS-URL: https://build.opensuse.org/request/show/1115669 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=156 --- e2fsprogs.changes | 5 +++++ e2fsprogs.spec | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index e2d0b2e..355ca21 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 4 16:34:10 UTC 2023 - Jan Kara + +- Update specfile to make sure regenerate_initrd_post macro is defined + ------------------------------------------------------------------- Wed Feb 8 10:14:18 UTC 2023 - Paolo Stivanin diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 4115b2d..d849a5a 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -79,6 +79,11 @@ Obsoletes: e2fsprogs-64bit %endif # # For regenerate_initrd_post macro +%if 0%{?suse_version} < 1550 +BuildRequires: suse-module-tools +%else +BuildRequires: rpm-config-SUSE +%endif Requires(post): /usr/bin/mkdir /usr/bin/touch Requires: libcom_err2 >= %{version} Requires: libext2fs2 >= %{version} @@ -282,7 +287,7 @@ done %if 0%{?suse_version} <= 1530 %install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz %endif -%{?regenerate_initrd_post} +%{regenerate_initrd_post} %if %{with systemd} %post -n e2fsprogs-scrub @@ -301,7 +306,7 @@ done %postun /sbin/ldconfig -%{?regenerate_initrd_post} +%{regenerate_initrd_post} %if %{with systemd} %postun -n e2fsprogs-scrub @@ -309,7 +314,7 @@ done %endif %posttrans -%{?regenerate_initrd_posttrans} +%{regenerate_initrd_posttrans} %post -n libext2fs2 -p /sbin/ldconfig