Add libpfm-fix-const.patch

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2389127

libpfm-fix-const.patch

@@ -0,0 +1,59 @@
+From ded148888c501c2e9d21c23263d7c09aed4b97d6 Mon Sep 17 00:00:00 2001
+From: Aaron Merey <amerey@redhat.com>
+Date: Fri, 19 Dec 2025 12:33:33 -0500
+Subject: [PATCH] fix discarded const warning on newer gcc
+
+---
+ lib/pfmlib_common.c  | 15 +++++++++------
+ tests/validate_x86.c |  2 +-
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/lib/pfmlib_common.c b/lib/pfmlib_common.c
+index 44b5de4..59a7cff 100644
+--- a/lib/pfmlib_common.c
++++ b/lib/pfmlib_common.c
+@@ -1625,12 +1625,6 @@ pfmlib_parse_event(const char *event, pfmlib_event_desc_t *d)
+ 	const char *pname = NULL;
+ 	int i, j, ret;
+ 
+-	/*
+-	 * support only one event at a time.
+-	 */
+-	p = strpbrk(event, PFMLIB_EVENT_DELIM);
+-	if (p)
+-		return PFM_ERR_INVAL;
+ 	/*
+ 	 * create copy because string is const
+ 	 */
+@@ -1638,6 +1632,15 @@ pfmlib_parse_event(const char *event, pfmlib_event_desc_t *d)
+ 	if (!str)
+ 		return PFM_ERR_NOMEM;
+ 
++	/*
++	 * support only one event at a time.
++	 */
++	p = strpbrk(s, PFMLIB_EVENT_DELIM);
++	if (p) {
++		free(s);
++		return PFM_ERR_INVAL;
++	}
++
+ 
+ 	/* check for optional PMU name */
+ 	p = strstr(s, PFMLIB_PMU_DELIM);
+diff --git a/tests/validate_x86.c b/tests/validate_x86.c
+index 500a697..68a776d 100644
+--- a/tests/validate_x86.c
++++ b/tests/validate_x86.c
+@@ -8018,7 +8018,7 @@ static int
+ check_pmu_supported(const char *evt)
+ {
+ 	pfm_pmu_info_t info;
+-	char *p;
++	const char *p;
+ 	int ret;
+ 	pfm_pmu_t i;
+ 
+-- 
+2.52.0
+

libpfm-gcc14.patch

@@ -0,0 +1,21 @@
+commit cb944829e0940d74009e09b8985b4f2139f5cb3b
+Author: William Cohen <wcohen@redhat.com>
+Date:   Mon Jan 29 16:23:43 2024 -0500
+
+    Correct s390x code to avoid GCC-14 -Werror=calloc-transposed-args errors
+
+diff --git a/lib/pfmlib_s390x_cpumf.c b/lib/pfmlib_s390x_cpumf.c
+index d8ce22d..718f5f8 100644
+--- a/lib/pfmlib_s390x_cpumf.c
++++ b/lib/pfmlib_s390x_cpumf.c
+@@ -216,8 +216,8 @@ static int pfm_cpumcf_init(void *this)
+ 		break;
+ 	}
+ 
+-	cpumcf_pe = calloc(sizeof(*cpumcf_pe),
+-			   cfvn_set_count + csvn_set_count + ext_set_count);
++	cpumcf_pe = calloc(cfvn_set_count + csvn_set_count + ext_set_count,
++			   sizeof(*cpumcf_pe));
+ 	if (cpumcf_pe == NULL)
+ 		return PFM_ERR_NOMEM;
+ 

libpfm.spec

@@ -4,22 +4,21 @@
 %if %{with python}
 %define python_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")
 %define python_prefix %(python3 -c "import sys; print (sys.prefix)")
-%{?filter_setup:
-%filter_provides_in %{python3_sitearch}/perfmon/.*\.so$
-%filter_setup
-}
+%global __provides_exclude_from ^%{python3_sitearch}/perfmon/.*\.so$
 %endif
 
 Name:		libpfm
 Version:	4.13.0
-Release:	5%{?dist}
+Release:	17%{?dist}
 
 Summary:	Library to encode performance events for use by perf tool
 
 License:	MIT
 URL:		http://perfmon2.sourceforge.net/
 Source0:	http://sourceforge.net/projects/perfmon2/files/libpfm4/%{name}-%{version}.tar.gz
+Patch1:		libpfm-fix-const.patch
 Patch2:		libpfm-python3-setup.patch
+Patch3:		libpfm-gcc14.patch
 
 BuildRequires: make
 BuildRequires:	gcc
@@ -73,7 +72,9 @@ Python bindings for libpfm4 and perf_event_open system call.
 
 %prep
 %setup -q
-%patch2 -p1 -b .python3
+%patch -P1 -p1 -b .fix-const
+%patch -P2 -p1 -b .python3
+%patch -P3 -p1 -b .gcc14
 # to prevent setuptools from installing an .egg, we need to pass --root to setup.py install
 # see https://github.com/pypa/setuptools/issues/3143
 # and https://github.com/pypa/pip/issues/11501
@@ -133,6 +134,42 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
 %endif
 
 %changelog
+* Tue Dec 16 2025 Aaron Merey <amerey@redhat.com> - 4.13.0-17
+- Add libpfm-fix-const.patch
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.13.0-16
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Mon Aug 25 2025 Aaron Merey <amerey@redhat.com> - 4.13.0-15
+- Fix path in tests/runtest.sh
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.13.0-14
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 4.13.0-12
+- Rebuilt for Python 3.14
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 4.13.0-9
+- Rebuilt for Python 3.13
+
+* Mon Jan 29 2024 William Cohen <wcohen@redhat.com> - 4.13.0-8
+- Fix gcc-14 -Werror=calloc-transposed-args compatibility
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Aug 1 2023 William Cohen <wcohen@redhat.com> - 4.13.0-5
 - migrated to SPDX license
 

plans/ci.fmf

@@ -1,6 +1,5 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    directory: tests
 execute:
-    how: beakerlib
+    how: tmt

tests/libpfm-testsuite/runtest.sh

@@ -55,7 +55,7 @@ rlJournalStart
     rlRun "yum-builddep -y $TmpDir/SPECS/*.spec"
     rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
     rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
-    rlRun "cd $TmpDir/BUILD/libpfm-*/tests"
+    rlRun "cd \"$TmpDir\"/BUILD/libpfm-*-build/libpfm-*/tests 2>/dev/null || cd \"$TmpDir\"/BUILD/libpfm-*/tests"
     rlRun "su -c 'make PFMLIB=`rpm -ql libpfm | grep .so | head -n 1`' $BUILD_USER"
     rlRun "ldd validate | tee $TmpDir/ldd.log"
     rlRun "grep -q 'libpfm.so' $TmpDir/ldd.log"