diff --git a/ci/provisioning/post_provision_config_common_functions.sh b/ci/provisioning/post_provision_config_common_functions.sh index 0b3d9413ab2..5c5e2a50fbd 100755 --- a/ci/provisioning/post_provision_config_common_functions.sh +++ b/ci/provisioning/post_provision_config_common_functions.sh @@ -323,7 +323,7 @@ post_provision_config_nodes() { rm -f "$REPOS_DIR"/*_job_daos-stack_job_*_job_*.repo time dnf -y erase fio fuse ior-hpc mpich-autoload \ argobots cart daos daos-client daos-spdk dpdk \ - libisa-l libpmemobj mercury mpich \ + libisa-l libpmemobj libpmemobj1 mercury mpich \ pmix protobuf-c spdk libfabric libpmem \ munge-libs munge slurm \ slurm-example-configs slurmctld slurm-slurmmd diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index b4b8af94452..7adcecc37e9 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -61,7 +61,11 @@ BuildRequires: libjson-c-devel BuildRequires: boost-devel %endif %if %{with server} -BuildRequires: libpmemobj-devel >= 2.1.0 +%if (0%{?suse_version} >= 1500) +BuildRequires: libpmemobj1-devel >= 2.1.2-1 +%else +BuildRequires: libpmemobj-devel >= 2.1.2-1 +%endif %endif BuildRequires: fused-devel %if (0%{?suse_version} >= 1500) @@ -164,10 +168,10 @@ Requires: ndctl # needed to set PMem configuration goals in BIOS through control-plane %if (0%{?suse_version} >= 1500) Requires: ipmctl >= 03.00.00.0423 -Requires: libpmemobj1 >= 2.1.0-1.suse1500 +Requires: libpmemobj1 >= 2.1.2-1 %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.0-1%{?dist} +Requires: libpmemobj >= 2.1.2-1 %endif Requires: mercury >= %{mercury_version} Requires(post): /sbin/ldconfig