SPECS/pmdk-convert.spec

@@ -1,14 +1,12 @@
-%global upstreamversion 1.7
-
 Name:		pmdk-convert
 Version:	1.7
-Release:	8%{?dist}
+Release:	1%{?dist}
 Summary:	Conversion tool for PMDK pools
 # Note: utils/cstyle is CDDL licensed. It's only used during development and it's NOT part of the binary RPM.
 License:	BSD
 URL:		https://github.com/pmem/pmdk-convert
 
-Source0:	https://github.com/pmem/pmdk-convert/releases/download/%{upstreamversion}/pmdk-convert-%{upstreamversion}.tar.gz
+Source0:	https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:	https://github.com/pmem/pmdk/archive/1.0.tar.gz#/nvml-1.0.tar.gz
 Source2:	https://github.com/pmem/pmdk/archive/1.1.tar.gz#/nvml-1.1.tar.gz
 Source3:	https://github.com/pmem/pmdk/releases/download/1.2.4/pmdk-1.2.4.tar.gz
@@ -21,15 +19,10 @@ Source8:	https://github.com/pmem/pmdk/releases/download/1.7/pmdk-1.7.tar.gz
 BuildRequires:	cmake >= 3.3
 BuildRequires:	glibc-devel
 BuildRequires:	gcc
-BuildRequires:	g++
+BuildRequires:	gcc-c++
 BuildRequires:	gdb
 
 # PMDK is currently available only on x86_64
-# Relevant bug reports:
-# 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
 
 %description
@@ -69,58 +62,32 @@ mkdir build
 cd build
 # TESTS_USE_FORCED_PMEM=ON to speed up tests on non-pmem file systems
 %cmake .. -DTESTS_USE_FORCED_PMEM=ON
-%cmake_build
+%make_build
 
 %install
 cd build
-%cmake_install
+%make_install
 
 %check
 cd build
-%ctest
+ctest -V
 
 %if 0%{?__debug_package} == 0
 %debug_package
 %endif
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.7-8
+* Mon Nov  4 2019 Jeff Moyer <jmoyer@redhat.com> - 1.7-1.el7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update to version 1.7
-  Related: rhbz#1991688
+- Resolves: rhbz#1768626
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7-7
+* Wed Jun 19 2019 Jeff Moyer <jmoyer@redhat.com> - 1.5.1-2.el8
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Bump release number and re-build to trigger gating tests
+- Related: rhbz#1659658
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-6
+* Tue May 28 2019 Jeff Moyer <jmoyer@redhat.com> - 1.5.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Initial RHEL 8 import.
+- Resolves: rhbz#1659658
 
-* Sat Oct 03 2020 Adam Borowski <kilobyte@angband.pl> - 1.7-5
+* Thu Nov 8 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5-1
-- Convert to new cmake macros, fixing FTBFS.
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Oct 01 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.7-1
-- Update to 1.7
-
-* Tue Oct 01 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5.2-1
-- Update to 1.5.2
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Mar 08 2019 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5.1-1
-- Update to 1.5.1
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Dec 14 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.5-1
 - Initial RPM release