Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1291125
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/papi?expand=0&rev=39

_multibuild

@@ -1,4 +0,0 @@
-<multibuild>
-  <package>standard</package>
-  <package>hpc</package>
-</multibuild>

papi-7.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:950d0e997e9e908f58c103efd54983e905b6cffa75ef52ed8fdd1ab441977bb6
-size 34744320

papi.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Mon Jul  7 17:42:58 UTC 2025 - Tony Jones <tonyj@suse.com>
+
+- Update from beta to full release version 7.2.0 (jsc#PED-13217)
+
+-------------------------------------------------------------------
+Mon Apr 21 18:56:16 UTC 2025 - Eyad Issa <eyadlorenzo@gmail.com>
+
+- Remove BuildRoot directive
+- Remove python3.patch and replaced with build time sed
+- Initial support for RISC-V architecture
+
+- Update to version 7.2.0b2:
+  * This release introduces improvements to the rocp_sdk component,
+    which supports AMD GPUs/APUs through the ROCprofiler-SDK
+    interface, currently still under development and testing.
+  * The release also includes general improvements to the PAPI
+    code, enhancing both design and functionality, as well as
+    various bug fixes.
+
+- Update to version 7.2.0b1:
+  * Basic support for the RISC-V architecture (no events yet)
+  * This release introduces a new component, rocp_sdk, which
+    supports AMD GPUs/APUs through the ROCprofiler-SDK interface,
+    currently still under development and testing.
+  * The release also includes general improvements to the PAPI
+    code, enhancing both design and functionality, as well as
+    various bug fixes.
+  * Full changelog at
+    https://github.com/icl-utk-edu/papi/releases/tag/papi-7-2-0b1-t
+
+-------------------------------------------------------------------
+Mon Mar 24 13:16:43 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Disable and remove support for gnu-hpc build flavours (bsc#1239982)
+- Redownload papi-7.1.0.tar.gz as it was not actually gzipped
+  and triggered and OBS error when running download_files.
+
 -------------------------------------------------------------------
 Tue Jan 23 18:52:36 UTC 2024 - Tony Jones <tonyj@suse.com>
 

papi.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package papi
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,63 +16,15 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
-
-%define pname papi
-%define ver 7.1.0
-%define _ver 7_1_0
-
-%if "%flavor" == ""
-ExclusiveArch:  do_not_build
-%define package_name %pname
-%endif
-
-# Magic for OBS Staging. Only build the flavors required by
-# other packages in the ring.
-%if %{with ringdisabled}
- %if "%flavor" != "standard"
-ExclusiveArch:  do_not_build
- %endif
-%endif
-
-%if "%flavor" == "standard"
-%{bcond_with hpc}
-%endif
-
-%if "%flavor" == "hpc"
-%{bcond_without hpc}
-%endif
-
-%if %{without hpc}
-%define package_name %{pname}
-%define libname() lib%{pname}%{?with_mpi:-%{mpi_family}}
-%define p_bindir %_bindir
-%define p_libdir %_libdir
-%define p_datadir %_datadir
-%define p_includedir %_includedir
-%define p_mandir %_mandir
-%else
-%{hpc_init %{?ext:-e %{ext}}}
-
-%define libname() lib%{pname}%{expand:%%{hpc_package_name_tail %{**}}}
-%define package_name %{hpc_package_name %_ver}
-%define p_bindir %hpc_bindir
-%define p_libdir %hpc_libdir
-%define p_datadir %hpc_datadir
-%define p_includedir %hpc_includedir
-%define p_mandir %hpc_mandir
-%endif
-
-Name:           %{package_name}
-Version:        %ver
+Name:           papi
+Version:        7.2.0
 Release:        0
 Summary:        Performance Application Programming Interface
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 URL:            http://icl.cs.utk.edu/papi/index.html
-Source:         http://icl.cs.utk.edu/projects/papi/downloads/%{pname}-%{version}.tar.gz
-Source1:        %{pname}-rpmlintrc
-Patch1:         python3.patch
+Source:         http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
+Source1:        %{name}-rpmlintrc
 
 BuildRequires:  autoconf >= 2.61
 BuildRequires:  automake
@@ -84,12 +36,6 @@ BuildRequires:  libsensors4-devel
 BuildRequires:  linux-kernel-headers
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
-%if %{with hpc}
-BuildRequires:  lua-lmod
-BuildRequires:  suse-hpc
-Requires:       lua-lmod
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #PAPI doesn't support the s390 architecture
 ExcludeArch:    s390 s390x
 %ifarch %ix86 x86_64 ia64
@@ -107,9 +53,6 @@ BuildRequires:  gcc-fortran-32bit
 BuildRequires:  glibc-devel-32bit
 %endif
 #BuildRequires:  libibmad-devel
-%if %{with hpc}
-Requires:       %{libname %_ver} = %version
-%endif
 
 %description
 
@@ -119,13 +62,11 @@ hardware found in most major microprocessors. PAPI enables software
 engineers to see, in near real time, the relation between software
 performance and processor events.
 
-%{?with_hpc:%{hpc_master_package -L}}
-
 %package        devel
 Summary:        Software Development Kit for PAPI
 Group:          Development/Libraries/C and C++
-Requires:       %{libname %_ver} = %version
 Requires:       %{name} = %{version}
+Requires:       lib%{name} = %version
 Requires:       linux-kernel-headers
 
 %description    devel
@@ -133,8 +74,6 @@ This package includes the C header files that specify the PAPI userspace
 libraries and interfaces. This is required for rebuilding any program
 that uses PAPI.
 
-%{?with_hpc:%{hpc_master_package -a devel}}
-
 %package        devel-static
 Summary:        Static PAPI libraries
 Group:          Development/Libraries/C and C++
@@ -144,28 +83,23 @@ Requires:       linux-kernel-headers
 %description    devel-static
 This package includes the static PAPI libraries.
 
-%package -n     %{libname %_ver}
+%package -n     lib%{name}
 Summary:        PAPI runtime library
 Group:          System/Libraries
 
-%description -n %{libname %_ver}
+%description -n lib%{name}
 This package contains the PAPI runtime library.
 
-%{?with_hpc:%{hpc_master_package  -l -L}}
-
 %prep
-%setup -q -n %{pname}-%{version}
-%autopatch -p1
+%setup -q -n %{name}-%{version}
 
-# Create baselibs.conf dynamically (non-HPC build only).
-%if %{without hpc}
+# Create baselibs.conf dynamically
 cat > %{_sourcedir}/baselibs.conf  <<EOF
 %{libname %_ver}
 %{name}-devel
   requires -%{name}-<targettype>
   requires "%{libname %_ver}-<targettype> = <version>"
 EOF
-%endif
 
 %build
 %define _lto_cflags %{nil}
@@ -174,128 +108,74 @@ mv configure.in configure.ac
 autoreconf -fi
 export CFLAGS="%{optflags} -Wno-unused-parameter"
 
-%if %{without hpc}
     %configure \
-%else
-    %hpc_configure \
-%endif
 	--with-perf-events --with-pthread-mutexes  \
 	--with-shared-lib=yes --with-shlib \
 	--with-pfm-incdir=%{_includedir} --with-pfm-libdir=%{_libdir}
 
-make DOCDIR=%{_defaultdocdir}/%{pname} %{?_smp_mflags}
+make DOCDIR=%{_defaultdocdir}/%{name} %{?_smp_mflags}
+
+# Remove env usage from shebangs on every *.py file
+find . -name "*.py" -exec sed -i 's"#!/usr/bin/env python3"#!/usr/bin/python3"g' {} +
 
 %install
 # for some reason this isn't being created by install before cp of
-# papi_hl_output_writer.py occurs, which results in %{p_bindir} as regular file
-mkdir -p %{buildroot}/%{p_bindir}
+# papi_hl_output_writer.py occurs, which results in %{_bindir} as regular file
+mkdir -p %{buildroot}/%{_bindir}
 cd src
-make DESTDIR=%{buildroot} install %{?_smp_mflags} DOCDIR=%{_defaultdocdir}/%{pname} LDCONFIG=/bin/true
+make DESTDIR=%{buildroot} install %{?_smp_mflags} DOCDIR=%{_defaultdocdir}/%{name} LDCONFIG=/bin/true
 ls -lR %{buildroot}
-chrpath --delete %{buildroot}%{p_libdir}/*.so*
-%if %{with hpc}
-%{hpc_compress_man 3}
-%hpc_write_modules_files
-#%%Module1.0#####################################################################
+chrpath --delete %{buildroot}%{_libdir}/*.so*
 
-proc ModulesHelp { } {
+%post -n lib%{name} -p /sbin/ldconfig
 
-    puts stderr " "
-    puts stderr "This module loads the %{pname} library"
-    puts stderr "toolchain."
-    puts stderr "\nVersion %{version}\n"
-
-}
-module-whatis "Name: %{pname}"
-module-whatis "Version: %{version}"
-module-whatis "Category: runtime library"
-module-whatis "Description: %{SUMMARY:0}"
-module-whatis "URL %{url}"
-
-set     version                     %{version}
-
-prepend-path    PATH                %{hpc_bindir}
-prepend-path    MANPATH             %{hpc_mandir}
-prepend-path    LD_LIBRARY_PATH     %{hpc_libdir}
-
-setenv          %{hpc_upcase %pname}_DIR        %{hpc_prefix}
-setenv          %{hpc_upcase %pname}_BIN        %{hpc_bindir}
-setenv          %{hpc_upcase %pname}_LIB        %{hpc_libdir}
-
-if {[file isdirectory  %{hpc_includedir}]} {
-prepend-path    LIBRARY_PATH        %{hpc_libdir}
-prepend-path    CPATH               %{hpc_includedir}
-prepend-path    C_INCLUDE_PATH      %{hpc_includedir}
-prepend-path    CPLUS_INCLUDE_PATH  %{hpc_includedir}
-prepend-path    INCLUDE                         %{hpc_includedir}
-%hpc_modulefile_add_pkgconfig_path
-
-setenv          %{hpc_upcase %pname}_INC        %{hpc_includedir}
-}
-EOF
-%endif
-
-%post -n %{libname %_ver} -p /sbin/ldconfig
-
-%postun -n %{libname %_ver}
+%postun -n lib%{name}
 /sbin/ldconfig
-%{?with_hpc:%{hpc_module_delete_if_default}}
 
 %files
+%license LICENSE.txt
 %defattr(-,root,root)
-%if %{with hpc}
-%hpc_dirs
-%dir %hpc_datadir
-%dir %hpc_bindir
-%hpc_modules_files
-%endif
-%{p_bindir}/papi_clockres
-%{p_bindir}/papi_command_line
-%{p_bindir}/papi_cost
-%{p_bindir}/papi_decode
-%{p_bindir}/papi_event_chooser
-%{p_bindir}/papi_mem_info
-%{p_bindir}/papi_native_avail
-%{p_bindir}/papi_version
-%{p_bindir}/papi_xml_event_info
-%{p_bindir}/papi_component_avail
-%{p_bindir}/papi_error_codes
-%{p_bindir}/papi_multiplex_cost
-%{p_bindir}/papi_hardware_avail
-%{p_bindir}/papi_hl_output_writer.py
-%{p_datadir}/%{pname}
-%{p_bindir}/papi_avail
-%doc ChangeLog*.txt LICENSE.txt README.md RELEASENOTES.txt
+%{_bindir}/papi_clockres
+%{_bindir}/papi_command_line
+%{_bindir}/papi_cost
+%{_bindir}/papi_decode
+%{_bindir}/papi_event_chooser
+%{_bindir}/papi_mem_info
+%{_bindir}/papi_native_avail
+%{_bindir}/papi_version
+%{_bindir}/papi_xml_event_info
+%{_bindir}/papi_component_avail
+%{_bindir}/papi_error_codes
+%{_bindir}/papi_multiplex_cost
+%{_bindir}/papi_hardware_avail
+%{_bindir}/papi_hl_output_writer.py
+%{_datadir}/%{name}
+%{_bindir}/papi_avail
+%doc ChangeLog*.txt README.md RELEASENOTES.txt
 
 %files devel
 %defattr(-,root,root)
-%if %{with hpc}
-%dir %hpc_mandir
-%dir %hpc_mandir/man1
-%dir %hpc_mandir/man3
-%dir %hpc_includedir
-%dir %hpc_pkgconfigdir
-%endif
-%{p_includedir}/f77papi.h
-%{p_includedir}/f90papi.h
-%{p_includedir}/fpapi.h
-%{p_includedir}/papi.h
-%{p_includedir}/papiStdEventDefs.h
-%{p_includedir}/sde_lib.h
-%{p_includedir}/sde_lib.hpp
-%doc %{p_mandir}/man3/*.gz
-%doc %{p_mandir}/man1/*
-%{p_libdir}/libpapi.so
-%{p_libdir}/libsde.so
-%{p_libdir}/pkgconfig/*.pc
+%{_includedir}/f77papi.h
+%{_includedir}/f90papi.h
+%{_includedir}/fpapi.h
+%{_includedir}/papi.h
+%{_includedir}/papiStdEventDefs.h
+%{_includedir}/papi_components_config_event_defs.h
+%{_includedir}/sde_lib.h
+%{_includedir}/sde_lib.hpp
+%doc %{_mandir}/man3/*.gz
+%doc %{_mandir}/man1/*
+%{_libdir}/libpapi.so
+%{_libdir}/libsde.so
+%{_libdir}/pkgconfig/*.pc
 
 %files devel-static
 %defattr(-,root,root)
-%{p_libdir}/lib*.a
+%{_libdir}/lib*.a
 
-%files -n %{libname %_ver}
+%files -n lib%{name}
 %defattr(-,root,root)
-%{p_libdir}/libpapi.so.*
-%{p_libdir}/libsde.so.*
+%{_libdir}/libpapi.so.*
+%{_libdir}/libsde.so.*
 
 %changelog

python3.patch

@@ -1,8 +0,0 @@
---- papi-6.0.0.1/src/high-level/scripts/papi_hl_output_writer.py.orig	2022-03-04 13:11:39.915443000 -0800
-+++ papi-6.0.0.1/src/high-level/scripts/papi_hl_output_writer.py	2022-03-04 13:09:46.986474000 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- from __future__ import division
- from collections import OrderedDict
-