From db1b09db2e4172c425705fc9d4f827b1184a2adcc8beaf8779e5a0507bcc0cd8 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.com>
Date: Tue, 2 Feb 2021 16:02:45 +0000
Subject: [PATCH] Accepting request 867513 from home:kukuk:etc

- Fix usage of info macros on openSUSE, we use file triggers today
- Use file requires for post section

OBS-URL: https://build.opensuse.org/request/show/867513
OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=131
---
 e2fsprogs.changes | 6 ++++++
 e2fsprogs.spec    | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 0a329a3..87f8c1a 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 28 15:02:08 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- Fix usage of info macros on openSUSE, we use file triggers today
+- Use file requires for post section
+
 -------------------------------------------------------------------
 Thu Oct 29 10:31:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index f1dc715..266c975 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package e2fsprogs
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,14 +39,14 @@ BuildRequires:  xz
 BuildRequires:  makeinfo
 %endif
 # Define info macros if missing (for Fedora builds)
-%if 0%{!?%install_info_prereq:1}
+%if ! 0%{?suse_version}
 %define install_info_prereq info
 %define install_info sbin/install-info
 %define install_info_delete sbin/install-info --delete
-%endif
 Requires(post): %install_info_prereq
 Requires(preun): %install_info_prereq
 %endif
+%endif
 # bug437293
 %ifarch ppc64
 Obsoletes:      e2fsprogs-64bit
@@ -74,7 +74,8 @@ Summary:        Utilities for the Second Extended File System
 License:        GPL-2.0-only
 Group:          System/Filesystems
 URL:            http://e2fsprogs.sourceforge.net
-Requires(post): coreutils
+# For regenerate_initrd_post macro
+Requires(post): /usr/bin/mkdir /usr/bin/touch
 Requires:       libcom_err2 >= %{version}
 Requires:       libext2fs2 >= %{version}
 Suggests:       e2fsprogs-scrub