From c164bc3f3dbc3215298e78d4acaaea8513f0ef33 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 26 Jun 2017 16:52:09 -0600 Subject: [PATCH] LU-9713 build: Require uptodate libcom_err, libss Ensure that the libcom_err and libext2fs2 packages installed match the other packages built from e2fsprogs so that modifications to those libraries (e.g. project quota) are available. Test-Parameters: clientdistro=sles12sp2 mdsdistro=sles12sp2 ossdistro=sles12sp2 Change-Id: Idc22a029a6950cc1ffb9b6e44181d345db3ebbe5 Signed-off-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/27834 Reviewed-by: Bob Glossman Tested-by: Jenkins Tested-by: Maloo --- e2fsprogs-SUSE_LINUX-11.spec.in | 9 ++++++--- e2fsprogs-SUSE_LINUX-12.spec.in | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/e2fsprogs-SUSE_LINUX-11.spec.in b/e2fsprogs-SUSE_LINUX-11.spec.in index 52b1905..35c6c8d 100644 --- a/e2fsprogs-SUSE_LINUX-11.spec.in +++ b/e2fsprogs-SUSE_LINUX-11.spec.in @@ -36,6 +36,8 @@ Release: 7%{_vendor} Summary: Utilities for the Second Extended File System Url: https://downloads.hpdd.intel.com/public/e2fsprogs/ Provides: ldiskfsprogs = %{version} +Requires: libcom_err2 = %{version}-%{release} +Requires: libext2fs2 = %{version}-%{release} Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,7 +63,8 @@ AutoReqProv: on Obsoletes: e2fsprogs-devel-64bit %endif # -Requires: libext2fs-devel = %version libblkid-devel libuuid-devel +Requires: libext2fs-devel = %version-%release libblkid-devel libuuid-devel +Requires: libcom_err-devel = %version-%release %description devel Dummy development package for backwards compatibility. @@ -94,7 +97,7 @@ License: GPL v2 or later Summary: Development files for libext2fs Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libext2fs2 = %version libcom_err-devel +Requires: libext2fs2 = %{version}-%{release} libcom_err-devel %description -n libext2fs-devel Development files for libext2fs. @@ -140,7 +143,7 @@ AutoReqProv: on Obsoletes: libcom_err-devel-64bit %endif # -Requires: libcom_err2 = %version +Requires: libcom_err2 = %{version}-%{release} %description -n libcom_err-devel Development files for the com_err error message display library. diff --git a/e2fsprogs-SUSE_LINUX-12.spec.in b/e2fsprogs-SUSE_LINUX-12.spec.in index 663f066..bef6ba0 100644 --- a/e2fsprogs-SUSE_LINUX-12.spec.in +++ b/e2fsprogs-SUSE_LINUX-12.spec.in @@ -35,6 +35,8 @@ Release: 7%{_vendor} Summary: Utilities for the Second Extended File System Url: https://downloads.hpdd.intel.com/public/e2fsprogs/ Provides: ldiskfsprogs = %{version} +Requires: libcom_err2 = %{version}-%{release} +Requires: libext2fs2 = %{version}-%{release} Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,7 +62,8 @@ AutoReqProv: on Obsoletes: e2fsprogs-devel-64bit %endif # -Requires: libext2fs-devel = %version libblkid-devel libuuid-devel +Requires: libext2fs-devel = %version-%release libblkid-devel libuuid-devel +Requires: libcom_err-devel = %version-%release %description devel Dummy development package for backwards compatibility. @@ -93,7 +96,7 @@ License: GPL v2 or later Summary: Development files for libext2fs Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libext2fs2 = %version libcom_err-devel +Requires: libext2fs2 = %{version}-%{release} libcom_err-devel %description -n libext2fs-devel Development files for libext2fs. @@ -139,7 +142,7 @@ AutoReqProv: on Obsoletes: libcom_err-devel-64bit %endif # -Requires: libcom_err2 = %version +Requires: libcom_err2 = %{version}-%{release} %description -n libcom_err-devel Development files for the com_err error message display library. -- 1.8.3.1