From 7e4470e8facc8a2c405a2bc2c0baf3e9bdcaa507 Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Wed, 5 Jul 2023 02:44:00 +0000 Subject: [PATCH] Fix rpmlint Provides/Obsoletes unversioned warnings It is recommended to specify version info for Provides/Obsoletes tags, see Fedora rpm guide[1] for more details about Obsolete tag usage. This also can fix below dnf update failure after installing lustre version e2fsprogs rpm. $ sudo dnf update Last metadata expiration check: 0:00:29 ago on Tue Jul 4 11:06:44 2023. Error: Problem 1: cannot install both e2fsprogs-1.46.5-4.oe1.aarch64 and e2fsprogs-1.46.6.wc1-0.oe1.aarch64 - cannot install the best update candidate for package e2fsprogs-libs-1.46.6.wc1-0.oe1.aarch64 - cannot install the best update candidate for package e2fsprogs-1.46.6.wc1-0.oe1.aarch64 Problem 2: problem with installed package e2fsprogs-1.46.6.wc1-0.oe1.aarch64 - cannot install both e2fsprogs-1.46.5-4.oe1.aarch64 and e2fsprogs-1.46.6.wc1-0.oe1.aarch64 - cannot install the best update candidate for package libcom_err-1.46.6.wc1-0.oe1.aarch64 (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages or '--nobest' to us e not only best candidate packages) [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#renaming-or-replacing-existing-packages Signed-off-by: Xinliang Liu --- e2fsprogs.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/e2fsprogs.spec b/e2fsprogs.spec index d2fed8d..a17ddcf 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.46.5 -Release: 4 +Release: 5 Summary: Second extended file system management tools License: GPLv2+ and LGPLv2 and MIT URL: http://e2fsprogs.sourceforge.net/ @@ -35,12 +35,12 @@ BuildRequires: fuse-devel libblkid-devel libuuid-devel BuildRequires: audit Recommends: %{name}-help = %{version}-%{release} -Provides: e2fsprogs-libs%{?_isa} e2fsprogs-libs -Obsoletes: e2fsprogs-libs -Provides: libcom_err%{?_isa} libcom_err -Obsoletes: libcom_err -Provides: libss%{?_isa} libss -Obsoletes: libss +Provides: e2fsprogs-libs%{?_isa} = %{version}-%{release} e2fsprogs-libs = %{version}-%{release} +Obsoletes: e2fsprogs-libs < %{version} +Provides: libcom_err%{?_isa} = %{version}-%{release} libcom_err = %{version}-%{release} +Obsoletes: libcom_err < %{version} +Provides: libss%{?_isa} = %{version}-%{release} libss = %{version}-%{release} +Obsoletes: libss < %{version} %description The e2fsprogs package consists of a lot of tools for users to create, @@ -55,12 +55,12 @@ Requires: gawk Requires: pkgconfig Requires(post): info Requires(preun): info -Provides: libcom_err-devel%{?_isa} libcom_err-devel -Obsoletes: libcom_err-devel -Provides: libss-devel%{?_isa} libss-devel -Obsoletes: libss-devel -Provides: e2fsprogs-static{?_isa} e2fsprogs-static -Obsoletes: e2fsprogs-static +Provides: libcom_err-devel%{?_isa} = %{version}-%{release} libcom_err-devel = %{version}-%{release} +Obsoletes: libcom_err-devel < %{version} +Provides: libss-devel%{?_isa} = %{version}-%{release} libss-devel = %{version}-%{release} +Obsoletes: libss-devel < %{version} +Provides: e2fsprogs-static{?_isa} = %{version}-%{release} e2fsprogs-static = %{version}-%{release} +Obsoletes: e2fsprogs-static < %{version} %description devel This package provides libraries and header files to develop @@ -169,6 +169,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Jul 05 2023 Xinliang Liu - 1.46.5-5 +- Fix rpmlint Provides/Obsoletes unversioned warnings to fix dnf update + * Thu Feb 9 2023 lihaoxiang - 1.46.5-4 - Upstream patches regress for debugfs, tune2fs and mmp. -- Gitee