- Fix usage of info macros on openSUSE, we use file triggers today

- Use file requires for post section

Rev filesystems/131 Md5 a300a5c4b799943dc84d912ba424246a 2021-02-02 16:02:45 jankara 867513

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>
 

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