.gitignore

@@ -1,2 +1 @@
-SOURCES/pmdk-1.12.1-man.tar.gz
+SOURCES/nvml-1.5.tar.gz
-SOURCES/pmdk-1.12.1.tar.gz

.nvml.metadata

@@ -1,2 +1 @@
-7d082f9737c9239b0c7f990d555d20e3b2fa59e1 SOURCES/pmdk-1.12.1-man.tar.gz
+e85cbdf54b195ad22bf7c9df40f7cf5c958af216 SOURCES/nvml-1.5.tar.gz
-f6dfb57243a6f5ab7624ea6543ab2ae1eb70bb9f SOURCES/pmdk-1.12.1.tar.gz

SOURCES/Makefile-bypass-check-doc-in-check.patch

@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -86,7 +86,7 @@ check-remote: require-rpmem all
- test check pcheck pycheck: all
-	$(MAKE) -C src $@
-
--check pcheck pycheck: check-doc
-+pcheck pycheck: check-doc
-
- cstyle:
-	test -d .git && utils/check-commits.sh

SOURCES/nvml-use-platform-python.patch

@@ -0,0 +1,21 @@
+diff -up nvml-1.5/src/Makefile.orig nvml-1.5/src/Makefile
+--- nvml-1.5/src/Makefile.orig	2018-10-31 17:05:03.774754808 -0400
++++ nvml-1.5/src/Makefile	2018-10-31 17:05:03.775754811 -0400
+@@ -199,7 +199,7 @@ install: all pkg-config
+ 	install -d $(PMREORDER_DESTDIR)
+ 	install -p -m 0644 $(PMREORDER_FILES) $(PMREORDER_DESTDIR)
+ 	@echo "#!/bin/sh" > $(PMREORDER_SRC)/pmreorder
+-	@echo "exec python3 $(PMREORDER_ROOTDIR)/pmreorder.py \$$*" >> $(PMREORDER_SRC)/pmreorder
++	@echo "exec /usr/libexec/platform-python $(PMREORDER_ROOTDIR)/pmreorder.py \$$*" >> $(PMREORDER_SRC)/pmreorder
+ 	install -d $(PMREORDER_BIN)
+ 	install -p $(PMREORDER_SRC)/pmreorder $(PMREORDER_BIN)
+ 	$(RM) $(PKG_CONFIG_FILES)
+diff -up nvml-1.5/src/tools/pmreorder/pmreorder.py.orig nvml-1.5/src/tools/pmreorder/pmreorder.py
+--- nvml-1.5/src/tools/pmreorder/pmreorder.py.orig	2018-10-31 17:05:23.932810923 -0400
++++ nvml-1.5/src/tools/pmreorder/pmreorder.py	2018-10-31 17:05:23.932810923 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/libexec/platform-python
+ #
+ # Copyright 2018, Intel Corporation
+ #

SOURCES/pmdk-1.12.1-use_ddebug_instead_of_debug_cflags.patch

@@ -1,18 +0,0 @@
---- pmdk-1.12.1/src/Makefile.inc.orig	2022-10-17 11:06:39.232365095 -0400
-+++ pmdk-1.12.1/src/Makefile.inc	2022-10-17 11:09:28.751365095 -0400
-@@ -73,14 +73,10 @@ endif
- DEFAULT_CFLAGS += -Wno-deprecated-declarations
- 
- ifeq ($(DEBUG),1)
--# Undefine _FORTIFY_SOURCE in case it's set in system-default or
--# user-defined CFLAGS as it conflicts with -O0.
--DEBUG_CFLAGS += -Wp,-U_FORTIFY_SOURCE
--DEBUG_CFLAGS += -O0 -ggdb -DDEBUG
- LIB_SUBDIR = /pmdk_debug
- OBJDIR = debug
- else
--DEFAULT_CFLAGS += -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-+DEFAULT_CFLAGS += -O2 -g -D_FORTIFY_SOURCE=2
- LIB_SUBDIR =
- OBJDIR = nondebug
- endif

SPECS/nvml.spec

@@ -1,75 +1,57 @@
 
 # rpmbuild options:
+#   --with | --without fabric
 #   --with | --without ndctl
+#   --define _testconfig <path to custom testconfig.sh>
 
 # do not terminate build if files in the $RPM_BUILD_ROOT
-# directory are not found in %%files (without pmemcheck case)
+# directory are not found in %%files (without fabric case)
 %define _unpackaged_files_terminate_build 0
 
-# disable 'make check'
+%bcond_without fabric
-%define _skip_check 1
 
-# by default build with ndctl, unless explicitly disabled
+# by default build w/ ndctl, unless explicitly disabled
 %bcond_without ndctl
 
-# by default build without pmemcheck, unless explicitly enabled
+%define min_libfabric_ver 1.4.2
-# pmemcheck is not packaged by Fedora
+%define min_ndctl_ver 59.2
-%bcond_with pmemcheck
-
-%define min_ndctl_ver 60.1
-%define upstreamversion 1.12.1
 
 Name:		nvml
-Version:	1.12.1
+Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
-Summary:	Persistent Memory Development Kit (formerly NVML)
+Summary:	Persistent Memory Development Kit (former NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
 
-Source0:	https://github.com/pmem/pmdk/releases/download/%{upstreamversion}/pmdk-%{upstreamversion}.tar.gz
+Source0:	https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# RHEL 9 does not ship pandoc, so the man pages have to be generated
+Patch0:		nvml-use-platform-python.patch
-# on another operating system (such as fedora or RHEL 8).  To do that,
-# run the included makedocs.sh script on a system with pandoc.
-Source1:	pmdk-%{version}-man.tar.gz
-
-# do_open passes "attr" to util_pool_open which potentially reads that object
-# but do_open never initializes "attr"
-# may read that object
-Patch0:         Makefile-bypass-check-doc-in-check.patch
-Patch1:         pmdk-1.12.1-use_ddebug_instead_of_debug_cflags.patch
-
 
 BuildRequires:	gcc
 BuildRequires:	make
-BuildRequires:	cmake
 BuildRequires:	glibc-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	man
 BuildRequires:	pkgconfig
-BuildRequires:	python3
+BuildRequires:	doxygen
-BuildRequires:	groff
+BuildRequires:	gdb
 
 %if %{with ndctl}
 BuildRequires:	ndctl-devel >= %{min_ndctl_ver}
 BuildRequires:	daxctl-devel >= %{min_ndctl_ver}
 %endif
 
-# for tests
+%if %{with fabric}
-BuildRequires:	gdb
+BuildRequires:	libfabric-devel >= %{min_libfabric_ver}
-BuildRequires:	bc
+%endif
-#BuildRequires:	valgrind
+
 
 # Debug variants of the libraries should be filtered out of the provides.
 %global __provides_exclude_from ^%{_libdir}/pmdk_debug/.*\\.so.*$
 
 # By design, PMDK does not support any 32-bit architecture.
-# Due to dependency on some inline assembly, PMDK can be compiled only
+# Due to dependency on xmmintrin.h and some inline assembly, it can be
-# on these architectures:
+# compiled only for x86_64 at the moment.
-# - x86_64
-# - ppc64le (experimental)
-# - aarch64 (unmaintained, supporting hardware doesn't exist?)
-#
 # Other 64-bit architectures could also be supported, if only there is
 # a request for that, and if somebody provides the arch-specific
 # implementation of the low-level routines for flushing to persistent
@@ -77,9 +59,10 @@ BuildRequires:	bc
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340634
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340635
+# https://bugzilla.redhat.com/show_bug.cgi?id=1340636
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340637
 
-ExclusiveArch: x86_64 ppc64le
+ExclusiveArch: x86_64
 
 %description
 The Persistent Memory Development Kit is a collection of libraries for
@@ -88,12 +71,14 @@ using memory-mapped persistence, optimized specifically for persistent memory.
 
 %package -n libpmem
 Summary: Low-level persistent memory support library
+Group: System Environment/Libraries
 %description -n libpmem
 The libpmem provides low level persistent memory support. In particular,
 support for the persistent memory instructions for flushing changes
-to pmem is provided.  This package provides the v1 API.
+to pmem is provided.
 
 %files -n libpmem
+%defattr(-,root,root,-)
 %dir %{_datadir}/pmdk
 %{_libdir}/libpmem.so.*
 %{_datadir}/pmdk/pmdk.magic
@@ -103,11 +88,12 @@ to pmem is provided.  This package provides the v1 API.
 
 %package -n libpmem-devel
 Summary: Development files for the low-level persistent memory library
+Group: Development/Libraries
 Requires: libpmem = %{version}-%{release}
 %description -n libpmem-devel
 The libpmem provides low level persistent memory support. In particular,
 support for the persistent memory instructions for flushing changes
-to pmem is provided. This package provides the v1 API.
+to pmem is provided.
 
 This library is provided for software which tracks every store to
 pmem and needs to flush those changes to durability. Most developers
@@ -115,23 +101,24 @@ will find higher level libraries like libpmemobj to be much more
 convenient.
 
 %files -n libpmem-devel
+%defattr(-,root,root,-)
 %{_libdir}/libpmem.so
 %{_libdir}/pkgconfig/libpmem.pc
 %{_includedir}/libpmem.h
 %{_mandir}/man7/libpmem.7.gz
 %{_mandir}/man3/pmem_*.3.gz
-%{_mandir}/man5/pmem_ctl.5.gz
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
 %package -n libpmem-debug
 Summary: Debug variant of the low-level persistent memory library
+Group: Development/Libraries
 Requires: libpmem = %{version}-%{release}
 %description -n libpmem-debug
 The libpmem provides low level persistent memory support. In particular,
 support for the persistent memory instructions for flushing changes
-to pmem is provided. This package provides the v1 API.
+to pmem is provided.
 
 This sub-package contains debug variant of the library, providing
 run-time assertions and trace points. The typical way to access the
@@ -139,6 +126,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 /usr/lib64/pmdk_debug.
 
 %files -n libpmem-debug
+%defattr(-,root,root,-)
 %dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmem.so
 %{_libdir}/pmdk_debug/libpmem.so.*
@@ -146,73 +134,17 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
-%package -n libpmem2
-Summary: Low-level persistent memory support library
-%description -n libpmem2
-The libpmem provides low level persistent memory support. In particular,
-support for the persistent memory instructions for flushing changes
-to pmem is provided. This package provides the v2 API.
-
-%files -n libpmem2
-%dir %{_datadir}/pmdk
-%{_libdir}/libpmem2.so.*
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-
-%package -n libpmem2-devel
-Summary: Development files for the low-level persistent memory library
-Requires: libpmem = %{version}-%{release}
-%description -n libpmem2-devel
-The libpmem provides low level persistent memory support. In particular,
-support for the persistent memory instructions for flushing changes
-to pmem is provided. This package provides the v2 API.
-
-This library is provided for software which tracks every store to
-pmem and needs to flush those changes to durability. Most developers
-will find higher level libraries like libpmemobj to be much more
-convenient.
-
-%files -n libpmem2-devel
-%{_libdir}/libpmem2.so
-%{_libdir}/pkgconfig/libpmem2.pc
-%{_includedir}/libpmem2.h
-%{_mandir}/man7/libpmem2*7.gz
-%{_mandir}/man3/pmem2_*.3.gz
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-
-%package -n libpmem2-debug
-Summary: Debug variant of the low-level persistent memory library
-Requires: libpmem = %{version}-%{release}
-%description -n libpmem2-debug
-The libpmem provides low level persistent memory support. In particular,
-support for the persistent memory instructions for flushing changes
-to pmem is provided. This package provides the v2 API.
-
-This sub-package contains debug variant of the library, providing
-run-time assertions and trace points. The typical way to access the
-debug version is to set the environment variable LD_LIBRARY_PATH to
-/usr/lib64/pmdk_debug.
-
-%files -n libpmem2-debug
-%dir %{_libdir}/pmdk_debug
-%{_libdir}/pmdk_debug/libpmem2.so
-%{_libdir}/pmdk_debug/libpmem2.so.*
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-
 %package -n libpmemblk
 Summary: Persistent Memory Resident Array of Blocks library
-Requires: libpmem >= %{version}-%{release}
+Group: System Environment/Libraries
+Requires: libpmem = %{version}-%{release}
 %description -n libpmemblk
 The libpmemblk implements a pmem-resident array of blocks, all the same
 size, where a block is updated atomically with respect to power
 failure or program interruption (no torn blocks).
 
 %files -n libpmemblk
+%defattr(-,root,root,-)
 %{_libdir}/libpmemblk.so.*
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
@@ -220,6 +152,7 @@ failure or program interruption (no torn blocks).
 
 %package -n libpmemblk-devel
 Summary: Development files for the Persistent Memory Resident Array of Blocks library
+Group: Development/Libraries
 Requires: libpmemblk = %{version}-%{release}
 Requires: libpmem-devel = %{version}-%{release}
 %description -n libpmemblk-devel
@@ -234,6 +167,7 @@ developers will find higher level libraries like libpmemobj to be
 more generally useful.
 
 %files -n libpmemblk-devel
+%defattr(-,root,root,-)
 %{_libdir}/libpmemblk.so
 %{_libdir}/pkgconfig/libpmemblk.pc
 %{_includedir}/libpmemblk.h
@@ -246,6 +180,7 @@ more generally useful.
 
 %package -n libpmemblk-debug
 Summary: Debug variant of the Persistent Memory Resident Array of Blocks library
+Group: Development/Libraries
 Requires: libpmemblk = %{version}-%{release}
 %description -n libpmemblk-debug
 The libpmemblk implements a pmem-resident array of blocks, all the same
@@ -258,6 +193,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 /usr/lib64/pmdk_debug.
 
 %files -n libpmemblk-debug
+%defattr(-,root,root,-)
 %dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmemblk.so
 %{_libdir}/pmdk_debug/libpmemblk.so.*
@@ -267,13 +203,15 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 
 %package -n libpmemlog
 Summary: Persistent Memory Resident Log File library
-Requires: libpmem >= %{version}-%{release}
+Group: System Environment/Libraries
+Requires: libpmem = %{version}-%{release}
 %description -n libpmemlog
 The libpmemlog library provides a pmem-resident log file. This is
 useful for programs like databases that append frequently to a log
 file.
 
 %files -n libpmemlog
+%defattr(-,root,root,-)
 %{_libdir}/libpmemlog.so.*
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
@@ -281,6 +219,7 @@ file.
 
 %package -n libpmemlog-devel
 Summary: Development files for the Persistent Memory Resident Log File library
+Group: Development/Libraries
 Requires: libpmemlog = %{version}-%{release}
 Requires: libpmem-devel = %{version}-%{release}
 %description -n libpmemlog-devel
@@ -290,6 +229,7 @@ record variable length entries. Most developers will find higher
 level libraries like libpmemobj to be more generally useful.
 
 %files -n libpmemlog-devel
+%defattr(-,root,root,-)
 %{_libdir}/libpmemlog.so
 %{_libdir}/pkgconfig/libpmemlog.pc
 %{_includedir}/libpmemlog.h
@@ -302,6 +242,7 @@ level libraries like libpmemobj to be more generally useful.
 
 %package -n libpmemlog-debug
 Summary: Debug variant of the Persistent Memory Resident Log File library
+Group: Development/Libraries
 Requires: libpmemlog = %{version}-%{release}
 %description -n libpmemlog-debug
 The libpmemlog library provides a pmem-resident log file. This
@@ -315,6 +256,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 /usr/lib64/pmdk_debug.
 
 %files -n libpmemlog-debug
+%defattr(-,root,root,-)
 %dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmemlog.so
 %{_libdir}/pmdk_debug/libpmemlog.so.*
@@ -324,13 +266,15 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 
 %package -n libpmemobj
 Summary: Persistent Memory Transactional Object Store library
-Requires: libpmem >= %{version}-%{release}
+Group: System Environment/Libraries
+Requires: libpmem = %{version}-%{release}
 %description -n libpmemobj
 The libpmemobj library provides a transactional object store,
 providing memory allocation, transactions, and general facilities for
 persistent memory programming.
 
 %files -n libpmemobj
+%defattr(-,root,root,-)
 %{_libdir}/libpmemobj.so.*
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
@@ -338,6 +282,7 @@ persistent memory programming.
 
 %package -n libpmemobj-devel
 Summary: Development files for the Persistent Memory Transactional Object Store library
+Group: Development/Libraries
 Requires: libpmemobj = %{version}-%{release}
 Requires: libpmem-devel = %{version}-%{release}
 %description -n libpmemobj-devel
@@ -347,10 +292,10 @@ persistent memory programming. Developers new to persistent memory
 probably want to start with this library.
 
 %files -n libpmemobj-devel
+%defattr(-,root,root,-)
 %{_libdir}/libpmemobj.so
 %{_libdir}/pkgconfig/libpmemobj.pc
 %{_includedir}/libpmemobj.h
-%dir %{_includedir}/libpmemobj
 %{_includedir}/libpmemobj/*.h
 %{_mandir}/man7/libpmemobj.7.gz
 %{_mandir}/man5/poolset.5.gz
@@ -367,6 +312,7 @@ probably want to start with this library.
 
 %package -n libpmemobj-debug
 Summary: Debug variant of the Persistent Memory Transactional Object Store library
+Group: Development/Libraries
 Requires: libpmemobj = %{version}-%{release}
 %description -n libpmemobj-debug
 The libpmemobj library provides a transactional object store,
@@ -380,6 +326,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 /usr/lib64/pmdk_debug.
 
 %files -n libpmemobj-debug
+%defattr(-,root,root,-)
 %dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmemobj.so
 %{_libdir}/pmdk_debug/libpmemobj.so.*
@@ -387,15 +334,144 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
+%package -n libvmem
+Summary: Volatile Memory allocation library
+Group: System Environment/Libraries
+%description -n libvmem
+The libvmem library turns a pool of persistent memory into a volatile
+memory pool, similar to the system heap but kept separate and with
+its own malloc-style API.
+
+%files -n libvmem
+%defattr(-,root,root,-)
+%{_libdir}/libvmem.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmem-devel
+Summary: Development files for the Volatile Memory allocation library
+Group: Development/Libraries
+Requires: libvmem = %{version}-%{release}
+%description -n libvmem-devel
+The libvmem library turns a pool of persistent memory into a volatile
+memory pool, similar to the system heap but kept separate and with
+its own malloc-style API.
+
+This sub-package contains libraries and header files for developing
+applications that want to make use of libvmem.
+
+%files -n libvmem-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvmem.so
+%{_libdir}/pkgconfig/libvmem.pc
+%{_includedir}/libvmem.h
+%{_mandir}/man7/libvmem.7.gz
+%{_mandir}/man3/vmem_*.3.gz
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmem-debug
+Summary: Debug variant of the Volatile Memory allocation library
+Group: Development/Libraries
+Requires: libvmem = %{version}-%{release}
+%description -n libvmem-debug
+The libvmem library turns a pool of persistent memory into a volatile
+memory pool, similar to the system heap but kept separate and with
+its own malloc-style API.
+
+This sub-package contains debug variant of the library, providing
+run-time assertions and trace points. The typical way to access the
+debug version is to set the environment variable LD_LIBRARY_PATH to
+/usr/lib64/pmdk_debug.
+
+%files -n libvmem-debug
+%defattr(-,root,root,-)
+%dir %{_libdir}/pmdk_debug
+%{_libdir}/pmdk_debug/libvmem.so
+%{_libdir}/pmdk_debug/libvmem.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmmalloc
+Summary: Dynamic to Persistent Memory allocation translation library
+Group: System Environment/Libraries
+%description -n libvmmalloc
+The libvmmalloc library transparently converts all the dynamic memory
+allocations into persistent memory allocations. This allows the use
+of persistent memory as volatile memory without modifying the target
+application.
+
+The typical usage of libvmmalloc is to load it via the LD_PRELOAD
+environment variable.
+
+%files -n libvmmalloc
+%defattr(-,root,root,-)
+%{_libdir}/libvmmalloc.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmmalloc-devel
+Summary: Development files for the Dynamic-to-Persistent allocation library
+Group: Development/Libraries
+Requires: libvmmalloc = %{version}-%{release}
+%description -n libvmmalloc-devel
+The libvmmalloc library transparently converts all the dynamic memory
+allocations into persistent memory allocations. This allows the use
+of persistent memory as volatile memory without modifying the target
+application.
+
+This sub-package contains libraries and header files for developing
+applications that want to specifically make use of libvmmalloc.
+
+%files -n libvmmalloc-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvmmalloc.so
+%{_libdir}/pkgconfig/libvmmalloc.pc
+%{_includedir}/libvmmalloc.h
+%{_mandir}/man7/libvmmalloc.7.gz
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmmalloc-debug
+Summary: Debug variant of the Dynamic-to-Persistent allocation library
+Group: Development/Libraries
+Requires: libvmmalloc = %{version}-%{release}
+%description -n libvmmalloc-debug
+The libvmmalloc library transparently converts all the dynamic memory
+allocations into persistent memory allocations. This allows the use
+of persistent memory as volatile memory without modifying the target
+application.
+
+This sub-package contains debug variant of the library, providing
+run-time assertions and trace points. The typical way to access the
+debug version is to set the environment variable LD_LIBRARY_PATH to
+/usr/lib64/pmdk_debug.
+
+%files -n libvmmalloc-debug
+%defattr(-,root,root,-)
+%dir %{_libdir}/pmdk_debug
+%{_libdir}/pmdk_debug/libvmmalloc.so
+%{_libdir}/pmdk_debug/libvmmalloc.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
 %package -n libpmempool
 Summary: Persistent Memory pool management library
-Requires: libpmem >= %{version}-%{release}
+Group: System Environment/Libraries
+Requires: libpmem = %{version}-%{release}
 %description -n libpmempool
 The libpmempool library provides a set of utilities for off-line
 administration, analysis, diagnostics and repair of persistent memory
-pools created by libpmemlog, libpmemblk and libpmemobj libraries.
+pools created by libpmemlog, libpemblk and libpmemobj libraries.
 
 %files -n libpmempool
+%defattr(-,root,root,-)
 %{_libdir}/libpmempool.so.*
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
@@ -403,14 +479,16 @@ pools created by libpmemlog, libpmemblk and libpmemobj libraries.
 
 %package -n libpmempool-devel
 Summary: Development files for Persistent Memory pool management library
+Group: Development/Libraries
 Requires: libpmempool = %{version}-%{release}
 Requires: libpmem-devel = %{version}-%{release}
 %description -n libpmempool-devel
 The libpmempool library provides a set of utilities for off-line
 administration, analysis, diagnostics and repair of persistent memory
-pools created by libpmemlog, libpmemblk and libpmemobj libraries.
+pools created by libpmemlog, libpemblk and libpmemobj libraries.
 
 %files -n libpmempool-devel
+%defattr(-,root,root,-)
 %{_libdir}/libpmempool.so
 %{_libdir}/pkgconfig/libpmempool.pc
 %{_includedir}/libpmempool.h
@@ -423,11 +501,12 @@ pools created by libpmemlog, libpmemblk and libpmemobj libraries.
 
 %package -n libpmempool-debug
 Summary: Debug variant of the Persistent Memory pool management library
+Group: Development/Libraries
 Requires: libpmempool = %{version}-%{release}
 %description -n libpmempool-debug
 The libpmempool library provides a set of utilities for off-line
 administration, analysis, diagnostics and repair of persistent memory
-pools created by libpmemlog, libpmemblk and libpmemobj libraries.
+pools created by libpmemlog, libpemblk and libpmemobj libraries.
 
 This sub-package contains debug variant of the library, providing
 run-time assertions and trace points. The typical way to access the
@@ -435,6 +514,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 /usr/lib64/pmdk_debug.
 
 %files -n libpmempool-debug
+%defattr(-,root,root,-)
 %dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmempool.so
 %{_libdir}/pmdk_debug/libpmempool.so.*
@@ -442,13 +522,93 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
+%if %{with fabric}
+
+%package -n librpmem
+Summary: Remote Access to Persistent Memory library
+Group: System Environment/Libraries
+Requires: libfabric >= %{min_libfabric_ver}
+Requires: openssh-clients
+%description -n librpmem
+The librpmem library provides low-level support for remote access
+to persistent memory utilizing RDMA-capable NICs. It can be used
+to replicate persistent memory regions over RDMA protocol.
+
+%files -n librpmem
+%defattr(-,root,root,-)
+%{_libdir}/librpmem.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n librpmem-devel
+Summary: Development files for the Remote Access to Persistent Memory library
+Group: Development/Libraries
+Requires: librpmem = %{version}-%{release}
+%description -n librpmem-devel
+The librpmem library provides low-level support for remote access
+to persistent memory utilizing RDMA-capable NICs. It can be used
+to replicate persistent memory regions over RDMA protocol.
+
+This sub-package contains libraries and header files for developing
+applications that want to specifically make use of librpmem.
+
+%files -n librpmem-devel
+%defattr(-,root,root,-)
+%{_libdir}/librpmem.so
+%{_libdir}/pkgconfig/librpmem.pc
+%{_includedir}/librpmem.h
+%{_mandir}/man7/librpmem.7.gz
+%{_mandir}/man3/rpmem_*.3.gz
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n librpmem-debug
+Summary: Debug variant of the Remote Access to Persistent Memory library
+Group: Development/Libraries
+Requires: librpmem = %{version}-%{release}
+%description -n librpmem-debug
+The librpmem library provides low-level support for remote access
+to persistent memory utilizing RDMA-capable NICs. It can be used
+to replicate persistent memory regions over RDMA protocol.
+
+This sub-package contains debug variant of the library, providing
+run-time assertions and trace points. The typical way to access the
+debug version is to set the environment variable LD_LIBRARY_PATH to
+/usr/lib64/pmdk_debug.
+
+%files -n librpmem-debug
+%defattr(-,root,root,-)
+%dir %{_libdir}/pmdk_debug
+%{_libdir}/pmdk_debug/librpmem.so
+%{_libdir}/pmdk_debug/librpmem.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n rpmemd
+Group: System Environment/Base
+Summary: Target node process executed by librpmem
+Requires: libfabric >= %{min_libfabric_ver}
+%description -n rpmemd
+The rpmemd process is executed on a target node by librpmem library
+and facilitates access to persistent memory over RDMA.
+
+%files -n rpmemd
+%{_bindir}/rpmemd
+%{_mandir}/man1/rpmemd.1.gz
+
+%endif # _with_fabric
+
 %package -n pmempool
 Summary: Utilities for Persistent Memory
-Requires: libpmem >= %{version}-%{release}
+Group: System Environment/Base
-Requires: libpmemlog >= %{version}-%{release}
+Requires: libpmem = %{version}-%{release}
-Requires: libpmemblk >= %{version}-%{release}
+Requires: libpmemlog = %{version}-%{release}
-Requires: libpmemobj >= %{version}-%{release}
+Requires: libpmemblk = %{version}-%{release}
-Requires: libpmempool >= %{version}-%{release}
+Requires: libpmemobj = %{version}-%{release}
+Requires: libpmempool = %{version}-%{release}
 Obsoletes: nvml-tools < %{version}-%{release}
 %description -n pmempool
 The pmempool is a standalone utility for management and off-line analysis
@@ -466,11 +626,31 @@ and users of the applications based on PMDK libraries.
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
+%package -n pmreorder
+Summary: Consistency Checker for Persistent Memory
+Group: __GROUP_SYS_BASE__
+Requires: /usr/libexec/platform-python
+%description -n pmreorder
+The pmreorder tool is a collection of python scripts designed to parse
+and replay operations logged by pmemcheck - a persistent memory checking tool.
+Pmreorder performs the store reordering between persistent memory barriers -
+a sequence of flush-fence operations. It uses a consistency checking routine
+provided in the command line options to check whether files are in a consistent state.
+
+%files -n pmreorder
+%{_bindir}/pmreorder
+%{_datadir}/pmreorder/*.py
+%{_mandir}/man1/pmreorder.1.gz
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
 %if %{with ndctl}
 
 %package -n daxio
 Summary: Perform I/O on Device DAX devices or zero a Device DAX device
-Requires: libpmem >= %{version}-%{release}
+Group: System Environment/Base
+Requires: libpmem = %{version}-%{release}
 %description -n daxio
 The daxio utility performs I/O on Device DAX devices or zero
 a Device DAX device.  Since the standard I/O APIs (read/write) cannot be used
@@ -485,53 +665,23 @@ a device.
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
 
-# _with_ndctl
+%endif # _with_ndctl
-%endif
 
-%if %{with pmemcheck}
-%package -n pmreorder
-Summary: Consistency Checker for Persistent Memory
-Requires: python3
-%description -n pmreorder
-The pmreorder tool is a collection of python scripts designed to parse
-and replay operations logged by pmemcheck - a persistent memory checking tool.
-Pmreorder performs the store reordering between persistent memory barriers -
-a sequence of flush-fence operations. It uses a consistency checking routine
-provided in the command line options to check whether files are in a consistent state.
-
-%files -n pmreorder
-%{_bindir}/pmreorder
-%{_datadir}/pmreorder/*.py
-%{_mandir}/man1/pmreorder.1.gz
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-# _with_pmemcheck
-%endif
 
 %prep
-%setup -q -n pmdk-%{upstreamversion}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
-
 
 %build
-# This package calls binutils components directly and would need to pass
-# in flags to enable the LTO plugins
-# Disable LTO
-%define _lto_cflags %{nil}
-
 # For debug build default flags may be overriden to disable compiler
 # optimizations.
-CFLAGS="%{optflags}" \
+%set_build_flags
-LDFLAGS="%{?__global_ldflags}" \
+NDCTL_ENABLE=y make %{?_smp_mflags} NORPATH=1
-make %{?_smp_mflags} NORPATH=1 DOC=n
 
 
 # Override LIB_AR with empty string to skip installation of static libraries
 %install
-make install DESTDIR=%{buildroot} \
+NDCTL_ENABLE=y make install DESTDIR=%{buildroot} \
-	DOC=n \
 	LIB_AR= \
 	prefix=%{_prefix} \
 	libdir=%{_libdir} \
@@ -542,52 +692,27 @@ make install DESTDIR=%{buildroot} \
 	docdir=%{_docdir}
 mkdir -p %{buildroot}%{_datadir}/pmdk
 cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
-mkdir -p %{buildroot}%{_mandir}
-(cd %{buildroot}%{_mandir}; tar xzvf %{SOURCE1})
-
-
-%check
-%if 0%{?_skip_check} == 1
-	echo "Check skipped"
-%else
-	echo "PMEM_FS_DIR=/tmp"                  > src/test/testconfig.sh
-	echo "PMEM_FS_DIR_FORCE_PMEM=1"         >> src/test/testconfig.sh
-	echo 'TEST_BUILD="debug nondebug"'      >> src/test/testconfig.sh
-	echo "TM=1"                             >> src/test/testconfig.sh
-
-	echo "config = {"                        > src/test/testconfig.py
-	echo "  'pmem_fs_dir': '/tmp',"         >> src/test/testconfig.py
-	echo "  'fs_dir_force_pmem': 1,"        >> src/test/testconfig.py
-	echo "  'build': ['debug', 'release']," >> src/test/testconfig.py
-	echo "  'tm': 1,"                       >> src/test/testconfig.py
-	echo "  'test_type': 'check',"          >> src/test/testconfig.py
-	echo "  'fs': 'all',"                   >> src/test/testconfig.py
-	echo "  'unittest_log_level': 1,"       >> src/test/testconfig.py
-	echo "  'keep_going': False,"           >> src/test/testconfig.py
-	echo "  'timeout': '30m',"              >> src/test/testconfig.py
-	echo "  'dump_lines': 30,"              >> src/test/testconfig.py
-	echo "  'force_enable': None,"          >> src/test/testconfig.py
-	echo "  'device_dax_path': [],"         >> src/test/testconfig.py
-	echo "  'granularity': 'cacheline',"    >> src/test/testconfig.py
-	echo "  'enable_admin_tests': False,"   >> src/test/testconfig.py
-	echo "  'fail_on_skip': False,"         >> src/test/testconfig.py
-	echo "  'cacheline_fs_dir': '/tmp',"    >> src/test/testconfig.py
-	echo "  'force_cacheline': True,"       >> src/test/testconfig.py
-	echo "  'granularity': 'cacheline',"    >> src/test/testconfig.py
-	echo "}"                                >> src/test/testconfig.py
-
-	rm -f src/test/obj_sync/TEST7
-
-	make pycheck
-	make check
-%endif
 
-%ldconfig_scriptlets   -n libpmem
+
-%ldconfig_scriptlets   -n libpmem2
+%post   -n libpmem -p /sbin/ldconfig
-%ldconfig_scriptlets   -n libpmemblk
+%postun -n libpmem -p /sbin/ldconfig
-%ldconfig_scriptlets   -n libpmemlog
+%post   -n libpmemblk -p /sbin/ldconfig
-%ldconfig_scriptlets   -n libpmemobj
+%postun -n libpmemblk -p /sbin/ldconfig
-%ldconfig_scriptlets   -n libpmempool
+%post   -n libpmemlog -p /sbin/ldconfig
+%postun -n libpmemlog -p /sbin/ldconfig
+%post   -n libpmemobj -p /sbin/ldconfig
+%postun -n libpmemobj -p /sbin/ldconfig
+%post   -n libvmem -p /sbin/ldconfig
+%postun -n libvmem -p /sbin/ldconfig
+%post   -n libvmmalloc -p /sbin/ldconfig
+%postun -n libvmmalloc -p /sbin/ldconfig
+%post   -n libpmempool -p /sbin/ldconfig
+%postun -n libpmempool -p /sbin/ldconfig
+
+%if %{with fabric}
+%post   -n librpmem -p /sbin/ldconfig
+%postun -n librpmem -p /sbin/ldconfig
+%endif
 
 %if 0%{?__debug_package} == 0
 %debug_package
@@ -595,149 +720,32 @@ mkdir -p %{buildroot}%{_mandir}
 
 
 %changelog
-* Tue Oct 18 2022 Bryan Gurney <bgurney@redhat.com > 1.12.1-1
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.5-2
-- Update to PMDK version 1.12.1
+- Rebuilt for MSVSphere 8.8
-- Related: rhbz#2111431
+
-
+* Wed Oct 31 2018 Jeff Moyer <jmoyer@redhat.com> - 1.5-2.el8
-* Mon Feb 07 2022 Bryan Gurney <bgurney@redhat.com> - 1.10.1-2
+- Fix up python3 uses to instead use platform-python (Jeff Moyer)
-- Use DDEBUG in Makefile.inc instead of DEBUG_CFLAGS
+- related: rhbz#1488828
-- Related: rhbz#2044882
+
-
+* Wed Oct 31 2018 Jeff Moyer <jmoyer@redhat.com> - 1.5-1.el8
-* Thu Oct 14 2021 Bryan Gurney <bgurney@redhat.com> - 1.10.1-1
+- rebase to pmdk-1.5, and rename to nvml (Jeff Moyer)
-- Update to PMDK version 1.10.1
+- broken libpmemcto was removed
-- Related: rhbz#1874208
+- c++ bindings were moved to a separate project/package
-- Remove BuildRequires line for libfabric-devel
+- Fix library requires to be =n-v-r instead of >= (Jeff Moyer)
-- Related: rhbz#2009502
+- resolves: rhbz#1488828
-
+
-* Mon Oct 04 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-11
+* Mon Oct 08 2018 Jeff Moyer <jmoyer@redhat.com> - 1.4-6.el8
-- Do not generate librpmem man pages
+- default to building daxio (Jeff Moyer)
-- Related: rhbz#2002998
+- Resolves: rhbz#1637168
-
+
-* Thu Sep 16 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-10
+* Wed Sep 26 2018 Jeff Moyer <jmoyer@redhat.com> - 1.4-5.el8
-- Do not build librpmem packages
+- use %set_build_flags instead of %{optflags}
-- Related: rhbz#2002998
+- Resolves: rhbz#1630611
-
+
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10-9
+* Tue May 22 2018 Jeff Moyer <jmoyer@redhat.com> - 1.4-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Get rid of SuSe conditionals (Jeff Moyer)
-  Related: rhbz#1991688
+- Remove the %check section. (Jeff Moyer)
-
+- Resolves: rhbz#1580829
-* Mon Aug 02 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-8.el9
-- Supersede uninitialized value patch with upstream version
-- Add upstream patch: common: fix mismatch between prototype and body
-- Makefile: bypass check-doc in check target
-- Related: rhbz#1985096
-
-* Fri Jul 30 2021 Bryan Gurney <bgurney@redhat.com> - 1.10.7-el9
-- Remove BuildRequires line for libunwind.devel
-- Resolves: rhbz#1984766
-
-* Wed Jun 16 2021 Jeff Moyer <jmoyer@redhat.com> - 1.10-6.el9
-- Build man pages outside of the rpm.
-- Resolves: rhbz#1943530
-
-* Mon Apr 26 2021 Jeff Moyer <jmoyer@redhat.com> - 1.10-5
-- Don't run %check on the build infrastructure.
-- Resolves: rhbz#1951273
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Dec 04 2020 Jeff Law <law@redhat.com> - 1.10-2
-- Fix uninitialized variable in tests caught by gcc-11 (again)
-
-* Sat Oct 31 2020 Adam Borowski <kilobyte@angband.pl> - 1.10-1
-- Update to PMDK version 1.10
-- New set of binary libraries: libpmem2{,-devel,-debug}
-- Drop obj_sync/7 test as it randomly fails on ppc64le (to investigate).
-
-* Fri Oct 30 2020 Adam Borowski <kilobyte@angband.pl> - 1.9.2-2
-- Second attempt -- retry a transient failure on ppc64le.
-
-* Wed Oct 28 2020 Adam Borowski <kilobyte@angband.pl> - 1.9.2-1
-- Update to PMDK version 1.9.2
-- Install pmem_ctl(5).
-
-* Fri Oct 2 2020 Adam Borowski <kilobyte@angband.pl> - 1.9.1-1
-- Update to PMDK version 1.9.1
-
-* Tue Sep 15 2020 Jeff Law <law@redhat.com> - 1.9-5
-- Fix uninitialized variable in tests caught by gcc-11
-
-* Tue Aug 18 2020 Adam Borowski <kilobyte@angband.pl> - 1.9-4
-- Fix FTBFS with new binutils.
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 7 2020 Adam Borowski <kilobyte@angband.pl> - 1.9-1
-- Update to PMDK version 1.9
-- Drop upstreamed patches.
-- Add pandoc and groff to B-Reqs.
-- Add required testconfig.py fields.
-- Increase test timeout.
-
-* Tue Jun 30 2020 Jeff Law <law@redhat.com> - 1.8-3
-Disable LTO
-
-* Wed Feb 26 2020 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.8-2
-- Enable PPC64LE packages
-
-* Wed Feb 12 2020 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.8-1
-- Update to PMDK version 1.8. This release stops shipping
-  libvmem & libvmmalloc. These libraries are now provided by vmem
-  package.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Oct 1 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.7-1
-- Update to PMDK version 1.7
-
-* Fri Aug 30 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.6.1-1
-- Update to PMDK version 1.6.1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Mar 26 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.6-1
-- Update to PMDK version 1.6
-
-* Mon Mar 18 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.6-0.1.rc2
-- Update to PMDK version 1.6-rc2
-
-* Fri Mar 08 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5.1-1
-- Update to PMDK version 1.5.1
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Dec 14 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5-2
-- Remove Group: tag and add ownership information for libpmemobj headers
-  directory.
-
-* Tue Nov 6 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5-1
-- Update to PMDK version 1.5
-  libpmemobj C++ bindings moved to separate package (RHBZ #1647145)
-  pmempool convert is now a thin wrapper around pmdk-convert (RHBZ #1647147)
-
-* Fri Aug 17 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.4.2-1
-- Update to PMDK version 1.4.2 (RHBZ #1589406)
-
-* Tue Aug 14 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.4.2-0.2.rc1
-- Revert package name change
-
-* Tue Aug 14 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.4.2-0.1.rc1
-- Update to PMDK version 1.4.2-rc1 (RHBZ #1589406)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Mar 30 2018 Krzysztof Czurylo <krzysztof.czurylo@intel.com> - 1.4-3
 - Revert package name change