From eead38156770932e1930f6a6b9cac550440195b1 Mon Sep 17 00:00:00 2001 From: Krzysztof Czurylo Date: Fri, 30 Dec 2016 12:25:53 +0100 Subject: [PATCH] NVML 1.2 release --- .gitignore | 1 + nvml.spec | 106 +++++++++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 72 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 96a20b9..25d4d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /1.0.tar.gz /nvml-1.1.tar.gz +/nvml-1.2.tar.gz diff --git a/nvml.spec b/nvml.spec index 0187992..8119b81 100644 --- a/nvml.spec +++ b/nvml.spec @@ -1,7 +1,7 @@ Name: nvml -Version: 1.1 -Release: 3%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Non-Volatile Memory Library License: BSD URL: http://pmem.io/nvml @@ -12,6 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: man BuildRequires: pkgconfig +BuildRequires: doxygen # Debug variants of the libraries should be filtered out of the provides. @@ -45,7 +46,7 @@ support for the persistent memory instructions for flushing changes to pmem is provided. %files -n libpmem -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_datadir}/nvml %{_libdir}/libpmem.so.* %{_datadir}/nvml/nvml.magic @@ -68,7 +69,7 @@ will find higher level libraries like libpmemobj to be much more convenient. %files -n libpmem-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmem.so %{_libdir}/pkgconfig/libpmem.pc %{_includedir}/libpmem.h @@ -92,7 +93,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libpmem-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libpmem.so %{_libdir}/nvml_debug/libpmem.so.* @@ -110,7 +111,7 @@ size, where a block is updated atomically with respect to power failure or program interruption (no torn blocks). %files -n libpmemblk -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmemblk.so.* %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -133,7 +134,7 @@ developers will find higher level libraries like libpmemobj to be more generally useful. %files -n libpmemblk-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmemblk.so %{_libdir}/pkgconfig/libpmemblk.pc %{_includedir}/libpmemblk.h @@ -157,7 +158,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libpmemblk-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libpmemblk.so %{_libdir}/nvml_debug/libpmemblk.so.* @@ -175,7 +176,7 @@ useful for programs like databases that append frequently to a log file. %files -n libpmemlog -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmemlog.so.* %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -193,7 +194,7 @@ record variable length entries. Most developers will find higher level libraries like libpmemobj to be more generally useful. %files -n libpmemlog-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmemlog.so %{_libdir}/pkgconfig/libpmemlog.pc %{_includedir}/libpmemlog.h @@ -218,7 +219,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libpmemlog-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libpmemlog.so %{_libdir}/nvml_debug/libpmemlog.so.* @@ -236,7 +237,7 @@ providing memory allocation, transactions, and general facilities for persistent memory programming. %files -n libpmemobj -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmemobj.so.* %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -254,10 +255,11 @@ persistent memory programming. Developers new to persistent memory probably want to start with this library. %files -n libpmemobj-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmemobj.so %{_libdir}/pkgconfig/libpmemobj.pc %{_includedir}/libpmemobj.h +%{_includedir}/libpmemobj/*.h %{_mandir}/man3/libpmemobj.3.gz %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -279,7 +281,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libpmemobj-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libpmemobj.so %{_libdir}/nvml_debug/libpmemobj.so.* @@ -296,7 +298,7 @@ memory pool, similar to the system heap but kept separate and with its own malloc-style API. %files -n libvmem -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libvmem.so.* %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -315,7 +317,7 @@ This sub-package contains libraries and header files for developing applications that want to make use of libvmem. %files -n libvmem-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libvmem.so %{_libdir}/pkgconfig/libvmem.pc %{_includedir}/libvmem.h @@ -339,7 +341,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libvmem-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libvmem.so %{_libdir}/nvml_debug/libvmem.so.* @@ -360,7 +362,7 @@ The typical usage of libvmmalloc is to load it via the LD_PRELOAD environment variable. %files -n libvmmalloc -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libvmmalloc.so.* %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -380,7 +382,7 @@ This sub-package contains libraries and header files for developing applications that want to specifically make use of libvmmalloc. %files -n libvmmalloc-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libvmmalloc.so %{_libdir}/pkgconfig/libvmmalloc.pc %{_includedir}/libvmmalloc.h @@ -405,7 +407,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libvmmalloc-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libvmmalloc.so %{_libdir}/nvml_debug/libvmmalloc.so.* @@ -413,17 +415,41 @@ debug version is to set the environment variable LD_LIBRARY_PATH to %doc ChangeLog CONTRIBUTING.md README.md +# Specify a virtual Provide for libpmemobj++-static package, so the package +# usage can be tracked. +%package -n libpmemobj++-devel +Summary: C++ bindings for Persistent Memory Transactional Object Store library +Group: Development/Libraries +Provides: libpmemobj++-static = %{version}-%{release} +Requires: libpmemobj-devel = %{version}-%{release} +%description -n libpmemobj++-devel +The libpmemobj library provides a transactional object store, +providing memory allocation, transactions, and general facilities for +persistent memory programming. + +This sub-package contains header files for libpmemobj C++ bindings. + +%files -n libpmemobj++-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libpmemobj++.pc +%{_includedir}/libpmemobj++/*.hpp +%{_includedir}/libpmemobj++/detail/*.hpp +%{_docdir}/libpmemobj++-devel/* +%license LICENSE +%doc ChangeLog CONTRIBUTING.md README.md + + %package -n libpmempool Summary: Persistent Memory pool management library 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, libpemblk and libpmemobj libraries. +The libpmempool library provides a set of utilities for off-line +administration, analysis, diagnostics and repair of persistent memory +pools created by libpmemlog, libpemblk and libpmemobj libraries. %files -n libpmempool -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmempool.so.* %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -435,12 +461,12 @@ 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, libpemblk and libpmemobj libraries. +The libpmempool library provides a set of utilities for off-line +administration, analysis, diagnostics and repair of persistent memory +pools created by libpmemlog, libpemblk and libpmemobj libraries. %files -n libpmempool-devel -%defattr(644,root,root,-) +%defattr(-,root,root,-) %{_libdir}/libpmempool.so %{_libdir}/pkgconfig/libpmempool.pc %{_includedir}/libpmempool.h @@ -454,9 +480,9 @@ 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, libpemblk and libpmemobj libraries. +The libpmempool library provides a set of utilities for off-line +administration, analysis, diagnostics and repair of persistent memory +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 @@ -464,7 +490,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to /usr/lib64/nvml_debug. %files -n libpmempool-debug -%defattr(644,root,root,-) +%defattr(-,root,root,-) %dir %{_libdir}/nvml_debug %{_libdir}/nvml_debug/libpmempool.so %{_libdir}/nvml_debug/libpmempool.so.* @@ -486,12 +512,14 @@ Useful applications for administration and diagnosis of persistent memory. %files tools %{_bindir}/pmempool %{_mandir}/man1/pmempool.1.gz -%{_mandir}/man1/pmempool-info.1.gz +%{_mandir}/man1/pmempool-check.1.gz +%{_mandir}/man1/pmempool-convert.1.gz %{_mandir}/man1/pmempool-create.1.gz %{_mandir}/man1/pmempool-dump.1.gz -%{_mandir}/man1/pmempool-check.1.gz +%{_mandir}/man1/pmempool-info.1.gz %{_mandir}/man1/pmempool-rm.1.gz -%{_mandir}/man1/pmempool-convert.1.gz +%{_mandir}/man1/pmempool-sync.1.gz +%{_mandir}/man1/pmempool-transform.1.gz %config(noreplace) %{_sysconfdir}/bash_completion.d/pmempool.sh %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -520,7 +548,9 @@ make install DESTDIR=%{buildroot} \ includedir=%{_includedir} \ mandir=%{_mandir} \ bindir=%{_bindir} \ - sysconfdir=%{_sysconfdir} + sysconfdir=%{_sysconfdir} \ + docdir=%{_docdir} \ + CPP_DOC_DIR=libpmemobj++-devel mkdir -p %{buildroot}%{_datadir}/nvml cp utils/nvml.magic %{buildroot}%{_datadir}/nvml/ @@ -552,6 +582,10 @@ make check %changelog +* Fri Dec 30 2016 Krzysztof Czurylo - 1.2-1 +- Update to NVML version 1.2 (RHBZ #1383467) +- Add libpmemobj C++ bindings + * Thu Jul 14 2016 Krzysztof Czurylo - 1.1-3 - Add missing package version requirements diff --git a/sources b/sources index d9d935b..6fd5c09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb12a300c01b402a6e4fd685287dffd6 nvml-1.1.tar.gz +SHA512 (nvml-1.2.tar.gz) = 6d98dc80448ab23fc05d3db02f434a5e1f24142e2780bebaaffb38798b327be1df374b542048cf31f8a079c4364c49e935fa806162cd5b1c457b784cda8115f6