Remove iozone code from papi, Related rhbz#1972870

Signed-off-by: William Cohen <wcohen@redhat.com>

.gitignore

@@ -24,3 +24,4 @@ papi-4.1.0.tar.gz
 /papi-5.6.0.tar.gz
 /papi-5.7.0.tar.gz
 /papi-6.0.0.tar.gz
+/papi-6.0.0-noiozone.tar.gz

papi.spec

@@ -11,14 +11,18 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 6.0.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Requires: papi-libs = %{version}-%{release}
 URL: http://icl.cs.utk.edu/papi/
-Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
+# The upstream papi tar.gz file include iozone source code in it.
+# The license for iozone source code is not compatible, so it needs
+# to be eliminated from the srpm.
+# The iozone code has been removed from the upstream papi git repo
+# so when papi is rebased to a newer version it can be used as is.
+Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}-noiozone.tar.gz
 Patch1: papi-python3.patch
 Patch2: papi-a64fx.patch
-Patch3: papi-no-iozone.patch
 Patch4: papi-config.patch
 Patch5: papi-nostatic.patch
 BuildRequires: make
@@ -90,7 +94,6 @@ the PAPI user-space libraries and interfaces.
 %setup -q
 %patch1 -p1 -b .python3
 %patch2 -p1 -b .a64fx
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
@@ -190,6 +193,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 %endif
 
 %changelog
+* Wed Jun 16 2021 William Cohen <wcohen@redhat.com> - 6.0.0-9
+-Excise iozone code from papi source tarball.
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.0.0-8
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 

sources

@@ -1 +1 @@
-SHA512 (papi-6.0.0.tar.gz) = 2a4a245d64c3ac05ca9664194ac406cfb360fc0935afdee115ca0fc3f24b6051d1130426ed959fac2f711a2239100b37a4dfe8e0885697f4f4c049554c95258a
+SHA512 (papi-6.0.0-noiozone.tar.gz) = 585521f9d91c2f48028d896564d48ed6bbeda3dc3c8ecf9d159a5b3e497d70d75f42345451d02f75782e56efdfb24f4a9f5598b932dfc28b1056ba977a0c0180