public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/dnf5] f44: Remove obsolete patches
@ 2026-08-18 13:05
0 siblings, 0 replies; only message in thread
From: @ 2026-08-18 13:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/dnf5
Branch : f44
Commit : 484b36ce81f7438a84a132deecd67674201d96c9
Author : Petr Písař <ppisar@redhat.com>
Date : 2026-08-18T15:03:48+02:00
Stats : +0/-329 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/dnf5/c/484b36ce81f7438a84a132deecd67674201d96c9?branch=f44
Log:
Remove obsolete patches
---
diff --git a/0001-copr-update-detection-of-ELN.patch b/0001-copr-update-detection-of-ELN.patch
deleted file mode 100644
index b0a1e86..0000000
--- a/0001-copr-update-detection-of-ELN.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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/0002-transaction-use-system_clock-to_time_t-for-start-tim.patch b/0002-transaction-use-system_clock-to_time_t-for-start-tim.patch
deleted file mode 100644
index a82438a..0000000
--- a/0002-transaction-use-system_clock-to_time_t-for-start-tim.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0f7fcde0bf281b8bf7a2aa5fdabb9e24496df6bf Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov@gmail.com>
-Date: Mon, 29 Jun 2026 11:23:52 +0800
-Subject: [PATCH] transaction: use system_clock::to_time_t for start time
-
-On i686, time_t is a 32-bit long, so deriving the start time via
-duration_cast<seconds>(now().time_since_epoch()).count() narrows the
-64-bit count and trips GCC 16's -Wconversion, failing the build under
--Werror. system_clock::to_time_t() returns a time_t directly, so the
-narrowing is gone and the intent reads more clearly.
-
-For: https://github.com/rpm-software-management/dnf5/issues/2798
-Signed-off-by: Kefu Chai <tchaikov@gmail.com>
----
- libdnf5/base/transaction.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libdnf5/base/transaction.cpp b/libdnf5/base/transaction.cpp
-index ac6ee089..089e9ba0 100644
---- a/libdnf5/base/transaction.cpp
-+++ b/libdnf5/base/transaction.cpp
-@@ -967,8 +967,7 @@ Transaction::TransactionRunResult Transaction::Impl::_run(
- info.set_description(description);
- info.set_comment(comment);
- info.set_pid(getpid());
-- info.set_start_time(
-- std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count());
-+ info.set_start_time(std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()));
-
- // acquire the lock
- std::filesystem::path lock_file_path = config.get_installroot_option().get_value();
---
-2.55.0
-
diff --git a/0003-spec-Disable-modularity-on-RHEL-11.patch b/0003-spec-Disable-modularity-on-RHEL-11.patch
deleted file mode 100644
index e7703a5..0000000
--- a/0003-spec-Disable-modularity-on-RHEL-11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f252a9fbe6730c248d9c3756d74ea67ea817eb05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 19 Jun 2026 09:55:22 +0200
-Subject: [PATCH] spec: Disable modularity on RHEL >= 11
-
----
- dnf5.spec | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/dnf5.spec b/dnf5.spec
-index 8bad60ec..8ae53f3a 100644
---- a/dnf5.spec
-+++ b/dnf5.spec
-@@ -95,7 +95,13 @@ Provides: dnf5-command(versionlock)
-
- %bcond_without acl
- %bcond_without comps
-+
-+%if 0%{?rhel} >= 11
-+%bcond_with modulemd
-+%else
- %bcond_without modulemd
-+%endif
-+
- %bcond_without systemd
-
- %bcond_with html
---
-2.55.0
-
diff --git a/0004-Build-If-modularity-is-disabled-leave-out-artefacts-.patch b/0004-Build-If-modularity-is-disabled-leave-out-artefacts-.patch
deleted file mode 100644
index e131501..0000000
--- a/0004-Build-If-modularity-is-disabled-leave-out-artefacts-.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From df5367c33058847da659e9f45beba724712011be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 26 Jun 2026 10:22:25 +0200
-Subject: [PATCH] Build: If modularity is disabled, leave out artefacts related
- to modulariy
-
-Do not install modularity manual pages, state files, RPM provides.
-Adjust RPM package description.
-
-(Paragraphs about modularity in otherwise relevant manual pages will
-be removed later after introducing a preprocesor to the documentation
-files.)
----
- dnf5.spec | 35 ++++++++++++++++++++++++++---------
- doc/CMakeLists.txt | 6 +++++-
- doc/conf.py.in | 6 ++++--
- 3 files changed, 35 insertions(+), 12 deletions(-)
-
-diff --git a/dnf5.spec b/dnf5.spec
-index 8ae53f3a..408a702d 100644
---- a/dnf5.spec
-+++ b/dnf5.spec
-@@ -5,6 +5,12 @@
-
- %bcond dnf5_obsoletes_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 10]
-
-+%if 0%{?rhel} >= 11
-+%bcond_with modulemd
-+%else
-+%bcond_without modulemd
-+%endif
-+
- Name: dnf5
- Version: %{project_version_prime}.%{project_version_major}.%{project_version_minor}.%{project_version_micro}
- Release: 1%{?dist}
-@@ -58,7 +64,9 @@ Provides: dnf5-command(leaves)
- Provides: dnf5-command(list)
- Provides: dnf5-command(makecache)
- Provides: dnf5-command(mark)
-+%if %{with modulemd}
- Provides: dnf5-command(module)
-+%endif
- Provides: dnf5-command(offline)
- Provides: dnf5-command(provides)
- Provides: dnf5-command(reinstall)
-@@ -96,12 +104,6 @@ Provides: dnf5-command(versionlock)
- %bcond_without acl
- %bcond_without comps
-
--%if 0%{?rhel} >= 11
--%bcond_with modulemd
--%else
--%bcond_without modulemd
--%endif
--
- %bcond_without systemd
-
- %bcond_with html
-@@ -136,7 +138,9 @@ Provides: dnf5-command(versionlock)
-
- # ========== versions of dependencies ==========
-
-+%if %{with modulemd}
- %global libmodulemd_version 2.5.0
-+%endif
- %global librepo_version 1.20.0
- %global libsolv_version 0.7.36
- %global sqlite_version 3.35.0
-@@ -271,7 +275,7 @@ BuildRequires: python3-devel
- %description
- DNF5 is a command-line package manager that automates the process of installing,
- upgrading, configuring, and removing computer programs in a consistent manner.
--It supports RPM packages, modulemd modules, and comps groups & environments.
-+It supports RPM packages%{?with_modulemd:, modulemd modules,} and comps groups & environments.
-
- %post
- %if %{with dnf5_obsoletes_dnf}
-@@ -348,7 +352,9 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
- %{_mandir}/man8/dnf5-list.8.*
- %{_mandir}/man8/dnf5-makecache.8.*
- %{_mandir}/man8/dnf5-mark.8.*
-+%if %{with modulemd}
- %{_mandir}/man8/dnf5-module.8.*
-+%endif
- %{_mandir}/man8/dnf5-offline.8.*
- %{_mandir}/man8/dnf5-provides.8.*
- %{_mandir}/man8/dnf5-reinstall.8.*
-@@ -367,7 +373,9 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
- %{_mandir}/man7/dnf5-filtering.7.*
- %{_mandir}/man7/dnf5-forcearch.7.*
- %{_mandir}/man7/dnf5-installroot.7.*
-+%if %{with modulemd}
- %{_mandir}/man7/dnf5-modularity.7.*
-+%endif
- %{_mandir}/man7/dnf5-specs.7.*
- %{_mandir}/man7/dnf5-system-state.7.*
- %{_mandir}/man7/dnf5-changes-from-dnf4.7.*
-@@ -398,7 +406,9 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
- %{_mandir}/man8/dnf-list.8.*
- %{_mandir}/man8/dnf-makecache.8.*
- %{_mandir}/man8/dnf-mark.8.*
-+%if %{with modulemd}
- %{_mandir}/man8/dnf-module.8.*
-+%endif
- %{_mandir}/man8/dnf-offline.8.*
- %{_mandir}/man8/dnf-provides.8.*
- %{_mandir}/man8/dnf-reinstall.8.*
-@@ -417,7 +427,9 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
- %{_mandir}/man7/dnf-filtering.7.*
- %{_mandir}/man7/dnf-forcearch.7.*
- %{_mandir}/man7/dnf-installroot.7.*
-+%if %{with modulemd}
- %{_mandir}/man7/dnf-modularity.7.*
-+%endif
- %{_mandir}/man7/dnf-specs.7.*
- %{_mandir}/man7/dnf-system-state.7.*
- %{_mandir}/man7/dnf-changes-from-dnf4.7.*
-@@ -443,7 +455,6 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
- %package -n libdnf5
- Summary: Package management library
- License: LGPL-2.1-or-later
--#Requires: libmodulemd{?_isa} >= {libmodulemd_version}
- Requires: libsolv%{?_isa} >= %{libsolv_version}
- Requires: librepo%{?_isa} >= %{librepo_version}
- %if 0%{?fedora} >= 43 || 0%{?rhel} >= 11
-@@ -484,7 +495,9 @@ Package management library.
- %attr(0755, root, root) %ghost %dir %{_prefix}/lib/sysimage/libdnf5/comps_groups/groups
- %verify(not md5 size mtime) %attr(0644, root, root) %ghost %{_prefix}/lib/sysimage/libdnf5/environments.toml
- %verify(not md5 size mtime) %attr(0644, root, root) %ghost %{_prefix}/lib/sysimage/libdnf5/groups.toml
-+%if %{with modulemd}
- %verify(not md5 size mtime) %attr(0644, root, root) %ghost %{_prefix}/lib/sysimage/libdnf5/modules.toml
-+%endif
- %verify(not md5 size mtime) %attr(0644, root, root) %ghost %{_prefix}/lib/sysimage/libdnf5/nevras.toml
- %attr(0755, root, root) %ghost %dir %{_prefix}/lib/sysimage/libdnf5/offline
- %verify(not md5 size mtime) %attr(0644, root, root) %ghost %{_prefix}/lib/sysimage/libdnf5/offline/offline-transaction-state.toml
-@@ -1093,7 +1106,11 @@ ln -s dnf-makecache.timer %{buildroot}%{_unitdir}/dnf5-makecache.timer
- # own dirs and files that dnf5 creates on runtime
- mkdir -p %{buildroot}%{_prefix}/lib/sysimage/libdnf5
- for file in \
-- environments.toml groups.toml modules.toml nevras.toml packages.toml \
-+ environments.toml groups.toml \
-+%if %{with modulemd}
-+ modules.toml \
-+%endif
-+ nevras.toml packages.toml \
- system.toml \
- transaction_history.sqlite transaction_history.sqlite-shm \
- transaction_history.sqlite-wal
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 18b74f28..ad0eafcf 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -89,7 +89,9 @@ if(WITH_MAN)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-list.8 DESTINATION share/man/man8)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-makecache.8 DESTINATION share/man/man8)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-mark.8 DESTINATION share/man/man8)
-+ if(WITH_MODULEMD)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-module.8 DESTINATION share/man/man8)
-+ endif()
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-offline.8 DESTINATION share/man/man8)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-provides.8 DESTINATION share/man/man8)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-reinstall.8 DESTINATION share/man/man8)
-@@ -108,7 +110,9 @@ if(WITH_MAN)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-filtering.7 DESTINATION share/man/man7)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-forcearch.7 DESTINATION share/man/man7)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-installroot.7 DESTINATION share/man/man7)
-- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-modularity.7 DESTINATION share/man/man7)
-+ if(WITH_MODULEMD)
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-modularity.7 DESTINATION share/man/man7)
-+ endif()
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-specs.7 DESTINATION share/man/man7)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-system-state.7 DESTINATION share/man/man7)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/dnf5-changes-from-dnf4.7 DESTINATION share/man/man7)
-diff --git a/doc/conf.py.in b/doc/conf.py.in
-index fdd120f2..6ad57986 100644
---- a/doc/conf.py.in
-+++ b/doc/conf.py.in
-@@ -138,7 +138,6 @@ man_pages = [
- ('commands/list.8', 'dnf5-list', 'List Command', AUTHORS, 8),
- ('commands/makecache.8', 'dnf5-makecache', 'Makecache Command', AUTHORS, 8),
- ('commands/mark.8', 'dnf5-mark', ' Mark Command', AUTHORS, 8),
-- ('commands/module.8', 'dnf5-module', ' Module Command', AUTHORS, 8),
- ('commands/offline.8', 'dnf5-offline', ' Offline Command', AUTHORS, 8),
- ('commands/provides.8', 'dnf5-provides', 'Provides Command', AUTHORS, 8),
- ('commands/reinstall.8', 'dnf5-reinstall', 'Reinstall Command', AUTHORS, 8),
-@@ -170,7 +169,6 @@ man_pages = [
- ('misc/filtering.7', 'dnf5-filtering', 'Packages Filtering', AUTHORS, 7),
- ('misc/forcearch.7', 'dnf5-forcearch', 'Forcearch Parameter', AUTHORS, 7),
- ('misc/installroot.7', 'dnf5-installroot', 'Installroot Parameter', AUTHORS, 7),
-- ('misc/modularity.7', 'dnf5-modularity', 'Modularity Overview', AUTHORS, 7),
- ('misc/specs.7', 'dnf5-specs', 'Patterns Specification', AUTHORS, 7),
- ('misc/system-state.7', 'dnf5-system-state', 'System state', AUTHORS, 7),
- ('changes_from_dnf4.7', 'dnf5-changes-from-dnf4', 'Changes from the DNF4', AUTHORS, 7),
-@@ -184,6 +182,10 @@ man_pages = [
- ('dnf5.conf-todo.5', 'dnf5.conf-todo', 'Options that are documented/implemented in DNF but not in DNF5', AUTHORS, 5),
- ('dnf5.conf-deprecated.5', 'dnf5.conf-deprecated', 'Config Options that are deprecated in DNF5', AUTHORS, 5),
- ]
-+if "@WITH_MODULEMD@" == "ON":
-+ man_pages.append(('commands/module.8', 'dnf5-module', ' Module Command', AUTHORS, 8))
-+ man_pages.append(('misc/modularity.7', 'dnf5-modularity', 'Modularity Overview', AUTHORS, 7))
-+
-
- dnf_makecache_timer_name = "dnf-makecache.timer" if "@WITH_DNF5_OBSOLETES_DNF@" == "ON" else "dnf5-makecache.timer"
- dnf_makecache_service_name = "dnf-makecache.service" if "@WITH_DNF5_OBSOLETES_DNF@" == "ON" else "dnf5-makecache.service"
---
-2.55.0
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-18 13:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-18 13:05 [rpms/dnf5] f44: Remove obsolete patches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox