public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/etckeeper] rawhide: Enable dnf5, disable dnf plugin in EPEL 11
@ 2026-08-05 22:10 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-08-05 22:10 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/etckeeper
            Branch : rawhide
            Commit : 3eef2d7f697ec6acdc2f66b9b110159118de6423
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-07-26T23:14:31-04:00
            Stats  : +21/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/etckeeper/c/3eef2d7f697ec6acdc2f66b9b110159118de6423?branch=rawhide

            Log:
            Enable dnf5, disable dnf plugin in EPEL 11

RHEL 11 will use dnf5 as the package manager.

---
diff --git a/etckeeper.spec b/etckeeper.spec
index 5fcc54c..effcee6 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -2,12 +2,17 @@
 
 %if 0%{?fedora}
 %global with_brz 1
+%endif
+%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} < 11)
+%global with_dnf 1
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 11
 %global with_dnf5 1
 %endif
 
 Name:      etckeeper
 Version:   1.18.22
-Release:   9%{?dist}
+Release:   10%{?dist}
 Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
 License:   GPL-2.0-or-later
@@ -38,7 +43,9 @@ Requires:  crontabs
 Requires:  findutils
 Requires:  hostname
 Requires:  which
+%if 0%{?with_dnf}
 Requires:  %{name}-dnf = %{version}-%{release}
+%endif
 %if 0%{?with_dnf5}
 Requires:  %{name}-dnf5 = %{version}-%{release}
 %endif # with_dnf5
@@ -77,6 +84,7 @@ etckeeper with (bzr) bazaar repositories, install this package.
 %endif # with_brz
 
 
+%if 0%{?with_dnf}
 %package dnf
 Summary:  DNF plugin for etckeeper support
 BuildRequires: python3-devel
@@ -89,6 +97,7 @@ Requires: dnf-plugins-core
 %description dnf
 This package provides a DNF plugin for etckeeper. If you want to use
 etckeeper with DNF, install this package.
+%endif # with_dnf
 
 
 %if 0%{?with_dnf5}
@@ -138,9 +147,11 @@ cd brz-plugin
 cd ..
 %endif # with_brz
 
+%if 0%{?with_dnf}
 cd dnf-plugin
 %pyproject_buildrequires
 cd ..
+%endif # with_dnf
 
 
 %build
@@ -152,9 +163,11 @@ cd brz-plugin
 cd ..
 %endif # with_brz
 
+%if 0%{?with_dnf}
 cd dnf-plugin
 %pyproject_wheel
 cd ..
+%endif # with_dnf
 
 markdown_py -f README.html README.md
 
@@ -168,9 +181,11 @@ cd brz-plugin
 cd ..
 %endif # with_brz
 
+%if 0%{?with_dnf}
 cd dnf-plugin
 %pyproject_install
 cd ..
+%endif # with_dnf
 
 install -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/%{name}
 install -d  %{buildroot}%{_localstatedir}/cache/%{name}
@@ -231,6 +246,7 @@ fi
 %endif # with_brz
 
 
+%if 0%{?with_dnf}
 %files dnf
 %{python3_sitelib}/dnf-plugins/%{name}.py
 %exclude %{python3_sitelib}/dnf-plugins/__init__.py
@@ -238,6 +254,7 @@ fi
 %exclude %{python3_sitelib}/dnf-plugins/__pycache__/__init__.*
 # exclude egg-info dir, doesn't contain meaningful information
 %exclude %{python3_sitelib}/dnf_%{name}-*.dist-info
+%endif # with_dnf
 
 
 %if 0%{?with_dnf5}
@@ -247,6 +264,9 @@ fi
 
 
 %changelog
+* Mon Jul 27 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.18.22-10
+- Enable dnf5, disable dnf plugin in EPEL 11
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.22-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-05 22:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-05 22:10 [rpms/etckeeper] rawhide: Enable dnf5, disable dnf plugin in EPEL 11 Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox