diff --git a/dnf.spec b/dnf.spec index 1dbe23a..7071063 100644 --- a/dnf.spec +++ b/dnf.spec @@ -12,7 +12,7 @@ %global conflicts_dnf_plugins_extras_version 4.0.4 %global conflicts_dnfdaemon_version 0.3.19 -%bcond obsolete_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 10] +%bcond dnf5_obsoletes_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 10] # override dependencies for rhel 7 %if 0%{?rhel} == 7 @@ -68,7 +68,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.16.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPL-2.0-or-later AND GPL-1.0-only @@ -97,7 +97,7 @@ Conflicts: python3-dnf-plugins-extras-common < %{conflicts_dnf_plugins_extr %package data Summary: Common data and configuration files for DNF Requires: libreport-filesystem -%if %{without obsolete_dnf} +%if %{with dnf5_obsoletes_dnf} Requires: /etc/dnf/dnf.conf %endif Obsoletes: %{name}-conf <= %{version}-%{release} @@ -237,7 +237,7 @@ ln -sr %{buildroot}%{confdir}/protected.d %{buildroot}%{_sysconfdir}/yum/protec ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %endif -%if %{without obsolete_dnf} +%if %{with dnf5_obsoletes_dnf} rm %{buildroot}%{confdir}/%{name}.conf %endif @@ -292,13 +292,13 @@ popd %dir %{confdir}/modules.d %dir %{confdir}/modules.defaults.d %dir %{pluginconfpath} -%if %{with obsolete_dnf} +%if %{without dnf5_obsoletes_dnf} %dir %{confdir}/protected.d %dir %{confdir}/vars %endif %dir %{confdir}/aliases.d %exclude %{confdir}/aliases.d/zypper.conf -%if %{with obsolete_dnf} +%if %{without dnf5_obsoletes_dnf} %config(noreplace) %{confdir}/%{name}.conf %endif @@ -382,6 +382,9 @@ popd %{python3_sitelib}/%{name}/automatic/ %changelog +* Wed Aug 16 2023 Jan Kolarik - 4.16.2-4 +- Fixes of conditions in spec file + * Wed Aug 16 2023 Jan Kolarik - 4.16.2-3 - Configure copr repo dnf5-testing