From 6d171d46497df520c9316ab5ff3a3307addf9daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Mon, 18 Dec 2023 15:47:47 +0100
Subject: [PATCH] rebase to latest upstream release

Resolves: rhbz#2254956
---
 .gitignore   |  1 +
 sources      |  2 +-
 sysstat.spec | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8cb0d46..6cd3b19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /v12.7.1.tar.gz
 /v12.7.2.tar.gz
 /v12.7.4.tar.gz
+/v12.7.5.tar.gz
diff --git a/sources b/sources
index 8bb1d74..8a556e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v12.7.4.tar.gz) = 689b36cd43cc9f4b606d6bda01d5092765a0e5b3f6120719afad5b5a699bde06dc5a78259cdc15464ea8bbd0c2987a400b64021812eb432a311dac6d128ea547
+SHA512 (v12.7.5.tar.gz) = 97a96023b3d7e579184e1394b7a1ff8cc09654359a9f103ba954464aae8f31dbac275ff238e24cce57aa83a212bf18d91734f3f77f7c0ebc9c18b8958730753e
diff --git a/sysstat.spec b/sysstat.spec
index 0506093..37aa9b8 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,18 +1,26 @@
 Summary: Collection of performance monitoring tools for Linux
 Name: sysstat
-Version: 12.7.4
-Release: 2%{?dist}
+Version: 12.7.5
+Release: 1%{?dist}
 License: GPL-2.0-or-later
 
 URL: http://sebastien.godard.pagesperso-orange.fr
 Source: https://github.com/sysstat/sysstat/archive/v%{version}.tar.gz
 
+# PCP is no longer available for %%{ix86} on F40
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+%ifnarch %{ix86}
+BuildRequires: pcp-libs-devel
+%endif
+%else
+BuildRequires: pcp-libs-devel
+%endif
+
 BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: git
 BuildRequires: lm_sensors-devel
 BuildRequires: make
-BuildRequires: pcp-libs-devel
 BuildRequires: systemd-rpm-macros
 
 Requires: findutils
@@ -102,6 +110,9 @@ fi
 %{_localstatedir}/log/sa
 
 %changelog
+* Mon Dec 18 2023 Lukáš Zaoral <lzaoral@redhat.com> - 12.7.5-1
+- rebase to latest upstream release (rhbz#2254956)
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.7.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild