public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/hardinfo2] f44: Fix settings for EPEL 11
Date: Sat, 05 Sep 2026 16:42:53 GMT [thread overview]
Message-ID: <178862657386.1.10030731004639194367.rpms-hardinfo2-837d9d6c8497@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/hardinfo2
Branch : f44
Commit : 837d9d6c849761b9df77bf380ab28eb9dfbe8e69
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-07-27T22:05:05-04:00
Stats : +39/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/hardinfo2/c/837d9d6c849761b9df77bf380ab28eb9dfbe8e69?branch=f44
Log:
Fix settings for EPEL 11
ELN now identifies itself separately from Fedora, and as the basis for the
future RHEL 11, uses libsoup 3.x and is Wayland-only.
https://github.com/hardinfo2/hardinfo2/pull/294
---
diff --git a/294.patch b/294.patch
new file mode 100644
index 0000000..2d27857
--- /dev/null
+++ b/294.patch
@@ -0,0 +1,37 @@
+From 42d55aeff06d8263b6e21fec0670b7a9a1bea785 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Mon, 27 Jul 2026 21:52:53 -0400
+Subject: [PATCH] PACKAGE ELN and RHEL 11
+
+ELN now reports a future EL version (currently 11) rather than
+the Fedora version from which it is forked.
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d72675ca..25b2112e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,7 +181,7 @@ set(HARDINFO2_OS ${distro})
+
+ #fedora ->35
+ if(${disversion} LESS 35.99)
+- if(${distro} MATCHES "Fedora*")
++ if(${distro} MATCHES "Fedora*" AND NOT ${distro} MATCHES "FedoraELN*")
+ message("Fedora ->35 - LS24")
+ set(HARDINFO2_LIBSOUP3 0)
+ endif()
+@@ -206,8 +206,8 @@ endif()
+
+ #centos/redhat/oracle/alma/rocky 10
+ #note upgrade to 10.1 for sysbench to be available
+-if((${disversion} GREATER_EQUAL 10) AND (${disversion} LESS 10.99))
+- if(${distro} MATCHES "Red*" OR ${distro} MATCHES "CentOS*" OR ${distro} MATCHES "Oracle*" OR ${distro} MATCHES "Alma*" OR ${distro} MATCHES "Rocky*")
++if(${disversion} GREATER_EQUAL 10)
++ if(${distro} MATCHES "Red*" OR ${distro} MATCHES "CentOS*" OR ${distro} MATCHES "Oracle*" OR ${distro} MATCHES "Alma*" OR ${distro} MATCHES "Rocky*" OR ${distro} MATCHES "FedoraELN*")
+ message("Centos/Redhat/oracle/rocky/alma 10 - Missing xrandr vue to wayland standard")
+ SET(RPM_REQ "dmidecode, sysbench, udisks2, glx-utils, lm_sensors, xdg-utils, iperf3, fwupd, vulkan-tools, gawk") #miss xrandr
+ endif()
diff --git a/hardinfo2.spec b/hardinfo2.spec
index 24d3d57..af21244 100644
--- a/hardinfo2.spec
+++ b/hardinfo2.spec
@@ -46,6 +46,8 @@ Summary: System Information and Benchmark for Linux Systems
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-only
URL: https://github.com/hardinfo2/hardinfo2
Source0: %{url}/archive/release-%{version}/hardinfo2-release-%{version}.tar.gz
+# PACKAGE ELN and RHEL 11
+Patch0: %{url}/pull/294.patch
BuildRequires: gcc-c++
BuildRequires: cmake
reply other threads:[~2026-09-05 16:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178862657386.1.10030731004639194367.rpms-hardinfo2-837d9d6c8497@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox