Temporarily revert package name change

This commit is contained in:
Krzysztof Czurylo 2018-03-30 11:44:27 +02:00
parent bf94a0ea0d
commit 4c9749f56c
3 changed files with 15 additions and 12 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/nvml-1.3.tar.gz
/nvml-1.3.1.tar.gz
/pmdk-1.4.tar.gz
/nvml-1.4.tar.gz

View File

@ -2,9 +2,7 @@
# rpmbuild options:
# --with | --without fabric
# --with | --without ndctl
# --define "_testconfig <path to custom testconfig.sh or 'default'>"
# --define "_check <1|0>" - run make check or not
#
# --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 fabric case)
@ -12,7 +10,7 @@
# disable 'make check' on suse
%if %{defined suse_version}
%define _check 0
%define _skip_check 1
%define dist .suse%{suse_version}
%endif
@ -28,10 +26,10 @@
%define min_libfabric_ver 1.4.2
%define min_ndctl_ver 59.2
Name: pmdk
Name: nvml
Version: 1.4
Release: 2%{?dist}
Summary: Persistent Memory Development Kit
Release: 3%{?dist}
Summary: Persistent Memory Development Kit (former NVML)
License: BSD
URL: http://pmem.io/pmdk
@ -774,16 +772,16 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
%check
%if "%{_check}" == "1"
%if "%{_testconfig}" != "default"
%if 0%{?_skip_check} == 1
echo "Check skipped"
%else
%if %{defined _testconfig}
cp %{_testconfig} src/test/testconfig.sh
%else
echo "PMEM_FS_DIR=/tmp" > src/test/testconfig.sh
echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
%endif
make check
%else
echo "Check skipped"
%endif
%post -n libpmem -p /sbin/ldconfig
@ -814,6 +812,10 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
%changelog
* Fri Mar 30 2018 Krzysztof Czurylo <krzysztof.czurylo@intel.com> - 1.4-3
- Revert package name change
- Re-enable check
* Thu Mar 29 2018 Krzysztof Czurylo <krzysztof.czurylo@intel.com> - 1.4-2
- Fix issues found by rpmlint

View File

@ -1 +1 @@
SHA512 (pmdk-1.4.tar.gz) = 95dbea9acfea4a6cb433a25f56f7484946a93fbce1c5e0e1d6ff36e0824e3e0e9f28f37024918998358f8ff12e69d0902fcf88357b9ad12695f32e06e86ffac8
SHA512 (nvml-1.4.tar.gz) = 80065f954383ff75091ded14b17e32019ade6bbac9d5cd634331516d8253a0cf1689335a1a9e418e42a34e01d162bff7f76f96ae488115d9016a91d34f6fda5c