From c4e54df0eef0246a5975364c403410f199ca56b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Fri, 18 Sep 2026 13:20:28 +0200 Subject: [PATCH] Exclude etcd* from Fedora repos, now provided by ims-fedora-extras Fedora retired etcd in rawhide; ims-fedora-extras ships etcd 3.7.1 repackaged from the official upstream binaries. Add etcd* to excludepkgs in the dnf5 override and the ims-fedora/ims-fedora-updates repos so the older Fedora build is never picked. Bump release to 44-2. --- 50-ims-fedora-extras.repo | 4 ++-- ims-fedora-extras-release.spec | 6 +++++- ims-fedora-updates.repo | 2 +- ims-fedora.repo | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/50-ims-fedora-extras.repo b/50-ims-fedora-extras.repo index aa8107a..dc3e9a6 100644 --- a/50-ims-fedora-extras.repo +++ b/50-ims-fedora-extras.repo @@ -3,7 +3,7 @@ # (see "DROP-IN REPO DIRECTORIES" in dnf5.conf(5)). [fedora*] -excludepkgs=freeipa* frr* strongswan* +excludepkgs=etcd* freeipa* frr* strongswan* [updates*] -excludepkgs=freeipa* frr* strongswan* +excludepkgs=etcd* freeipa* frr* strongswan* diff --git a/ims-fedora-extras-release.spec b/ims-fedora-extras-release.spec index b13fa4d..eca9aa1 100644 --- a/ims-fedora-extras-release.spec +++ b/ims-fedora-extras-release.spec @@ -1,7 +1,7 @@ Summary: InfoMaOS Fedora extras release Name: ims-fedora-extras-release Version: 44 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://gitea.netst.org/rpms-fedora-extras/ims-fedora-extras-release @@ -39,6 +39,10 @@ install -pm 644 %{SOURCE3} %{buildroot}%{_datadir}/dnf5/repos.override.d %{_datadir}/dnf5/repos.override.d/50-ims-fedora-extras.repo %changelog +* Fri Sep 18 2026 Zoran Pericic - 44-2 +- Exclude etcd* from the fedora* and updates* repos: etcd is now packaged in + ims-fedora-extras from the official upstream binaries + * Thu Sep 10 2026 Zoran Pericic - 44-1 - Drop %%post scriptlet: "dnf config-manager --save" is dnf4-only and fails with exit status 2 on dnf5, making the install transaction report an error diff --git a/ims-fedora-updates.repo b/ims-fedora-updates.repo index e54a4bb..d1e2d56 100644 --- a/ims-fedora-updates.repo +++ b/ims-fedora-updates.repo @@ -7,4 +7,4 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch metadata_expire=1h skip_if_unavailable=True -excludepkgs="freeipa* frr* strongswan*" +excludepkgs="etcd* freeipa* frr* strongswan*" diff --git a/ims-fedora.repo b/ims-fedora.repo index 1486a40..a506988 100644 --- a/ims-fedora.repo +++ b/ims-fedora.repo @@ -6,4 +6,4 @@ cost=1001 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=True -excludepkgs="freeipa* frr* strongswan*" +excludepkgs="etcd* freeipa* frr* strongswan*"