[rpms/dnf5] f44: Adapt copr plugin for new ELN os-release identification

[rpms/dnf5] f44: Adapt copr plugin for new ELN os-release identification

[@ 2026-08-18 13:05 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/dnf5
Branch : f44
Commit : dc8a3912edf6a4e782a0b0b796cf95e8270be03a
Author : Petr Písař <ppisar@redhat.com>
Date   : 2026-08-18T15:00:38+02:00
Stats  : +63/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/dnf5/c/dc8a3912edf6a4e782a0b0b796cf95e8270be03a?branch=f44

Log:
Adapt copr plugin for new ELN os-release identification

---
diff --git a/0001-copr-update-detection-of-ELN.patch b/0001-copr-update-detection-of-ELN.patch
new file mode 100644
index 0000000..b0a1e86
--- /dev/null
+++ b/0001-copr-update-detection-of-ELN.patch
@@ -0,0 +1,58 @@
+From b2ce224fc2794a2cc9692e3e8f6d9bc225e9412f Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 7 May 2026 16:20:26 -0400
+Subject: [PATCH] copr: update detection of ELN
+
+ELN recently switched its os-release to identify closer to Enterprise Linux
+than Fedora, since that more accurately reflects its content and
+configuration.
+
+https://github.com/fedora-eln/eln/issues/513
+---
+ dnf5-plugins/copr_plugin/helpers.cpp             |  2 ++
+ .../copr_plugin/tests/data/os-release-fedora-eln | 16 +++++++++-------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/dnf5-plugins/copr_plugin/helpers.cpp b/dnf5-plugins/copr_plugin/helpers.cpp
+index 4bc3bdb3..ff92c13f 100644
+--- a/dnf5-plugins/copr_plugin/helpers.cpp
++++ b/dnf5-plugins/copr_plugin/helpers.cpp
+@@ -6,6 +6,8 @@ namespace dnf5 {
+ 
+ std::vector<std::string> repo_fallbacks(const std::string & name_version) {
+     std::smatch match;
++    if (std::regex_match(name_version, match, std::regex("^eln-([0-9]+)$")))
++        return {name_version, "fedora-eln"};
+     if (std::regex_match(name_version, match, std::regex("^(rhel|centos|almalinux)-([0-9]+)$")))
+         // try rhel-9-x86_64, then epel-9-x86_64
+         return {name_version, "epel-" + match.str(2)};
+diff --git a/dnf5-plugins/copr_plugin/tests/data/os-release-fedora-eln b/dnf5-plugins/copr_plugin/tests/data/os-release-fedora-eln
+index c42abe78..60d34e7b 100644
+--- a/dnf5-plugins/copr_plugin/tests/data/os-release-fedora-eln
++++ b/dnf5-plugins/copr_plugin/tests/data/os-release-fedora-eln
+@@ -1,13 +1,15 @@
+-NAME="Fedora Linux"
+-VERSION="39 (Rawhide Prerelease)"
+-ID=fedora
+-VERSION_ID=39
++NAME="ELN"
++VERSION="11"
++ID=eln
++ID_LIKE="rhel centos fedora"
++VERSION_ID=11
+ VERSION_CODENAME=""
+ PLATFORM_ID="platform:eln"
+-PRETTY_NAME="Fedora ELN"
+-ANSI_COLOR="0;38;2;60;110;180"
++PRETTY_NAME="Fedora ELN 11"
++ANSI_COLOR="0;31"
+ LOGO=fedora-logo-icon
+-CPE_NAME="cpe:/o:fedoraproject:fedora:39"
++CPE_NAME="cpe:/o:fedoraproject:fedora-eln:11"
++DEFAULT_HOSTNAME="eln"
+ HOME_URL="https://fedoraproject.org/"
+ DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/eln/"
+ SUPPORT_URL="https://ask.fedoraproject.org/"
+-- 
+2.54.0
+

diff --git a/dnf5.spec b/dnf5.spec
index 89f7309..6097585 100644
--- a/dnf5.spec
+++ b/dnf5.spec
@@ -7,11 +7,12 @@
 
 Name:           dnf5
 Version:        %{project_version_prime}.%{project_version_major}.%{project_version_minor}.%{project_version_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command-line package manager
 License:        GPL-2.0-or-later
 URL:            https://github.com/rpm-software-management/dnf5
 Source0:        %{url}/archive/%{version}/dnf5-%{version}.tar.gz
+Patch0:         0001-copr-update-detection-of-ELN.patch
 
 Requires:       libdnf5%{?_isa} = %{version}-%{release}
 Requires:       libdnf5-cli%{?_isa} = %{version}-%{release}
@@ -1144,6 +1145,9 @@ mkdir -p %{buildroot}%{_libdir}/libdnf5/plugins
 %ldconfig_scriptlets
 
 %changelog
+* Tue May 12 2026 Petr Pisar <ppisar@redhat.com> - 5.4.2.1-2
+- Adapt copr plugin for new ELN os-release identification (upstream GH#2729)
+
 * Wed May 06 2026 Evan Goode <mail@evangoo.de> - 5.4.2.1-1
 - Update to version 5.4.2.1