EX-5176 utils: fix package requirements for json-c

SLES15.3 uses "libjson-c3" for json-c RPM vs. "json-c" for RHEL.
Ubuntu 20.04 uses "libjson-c4" and 22.04 uses "libjson-c5", but
the right one is depended on by "libjson-c-dev".

Test-Parameters: trivial testlist=sanity clientdistro=sles15sp3
Test-Parameters: testlist=sanity clientdistro=ubuntu2004
Fixes: fbfd2d075534 ("EX-5176 pcc: use JSON string for trusted.pin xattr")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ibb01cfb7dadda83572be68961cf98450536980cf
Reviewed-on: https://review.whamcloud.com/47267
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Feng, Lei <flei@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/debian/control b/debian/control
index 6c3a4ea..94d01ad 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ Package: lustre-tests
 Section: utils
 Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64
 Priority: optional
-Depends: lustre-iokit (= ${binary:Version}), lustre-dev (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin, selinux-utils, mpi-default-dev
+Depends: lustre-iokit (= ${binary:Version}), lustre-dev (= ${binary:Version}), attr, libjson-c-dev, lsof, mpi-default-bin, mpi-default-dev, perl, rsync, selinux-utils
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  This release is maintained by Whamcloud and available from

diff --git a/debian/control.main b/debian/control.main
index 6c3a4ea..94d01ad 100644 (file)
--- a/debian/control.main
+++ b/debian/control.main
@@ -84,7 +84,7 @@ Package: lustre-tests
 Section: utils
 Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64
 Priority: optional
-Depends: lustre-iokit (= ${binary:Version}), lustre-dev (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin, selinux-utils, mpi-default-dev
+Depends: lustre-iokit (= ${binary:Version}), lustre-dev (= ${binary:Version}), attr, libjson-c-dev, lsof, mpi-default-bin, mpi-default-dev, perl, rsync, selinux-utils
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  This release is maintained by Whamcloud and available from

diff --git a/lustre.spec.in b/lustre.spec.in
index d450551..242dcec 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -357,10 +357,11 @@ Group: Development/Kernel
 Provides: lustre-devel = %{version}
 Requires: %{lustre_name} = %{version}
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
-Requires: json-c
 %if 0%{?suse_version} >= 1500
+Requires: libjson-c3
 BuildRequires: libjson-c-devel
 %else
+Requires: json-c
 BuildRequires: json-c-devel
 %endif