rpms/dnf
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert DNF obsoletion

Browse Source
This commit is contained in:
Jan Kolarik 2023-08-04 13:03:47 +02:00
parent 35d31efb39
commit 8a71368bcc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dnf.spec
View File

@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf Name: dnf
Version: 4.16.2 Version: 4.16.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: %{pkg_summary} Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING # For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPL-2.0-or-later AND GPL-1.0-only License: GPL-2.0-or-later AND GPL-1.0-only
@ -95,7 +95,7 @@ Conflicts: python3-dnf-plugins-extras-common < %{conflicts_dnf_plugins_extr
%package data %package data
Summary: Common data and configuration files for DNF Summary: Common data and configuration files for DNF
Requires: libreport-filesystem Requires: libreport-filesystem
%if 0%{?fedora} > 38 %if 0%{?fedora} > 40 || 0%{?rhel} > 10
Requires: /etc/dnf/dnf.conf Requires: /etc/dnf/dnf.conf
%endif %endif
Obsoletes: %{name}-conf <= %{version}-%{release} Obsoletes: %{name}-conf <= %{version}-%{release}
@ -235,7 +235,7 @@ ln -sr %{buildroot}%{confdir}/protected.d %{buildroot}%{_sysconfdir}/yum/protec
ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
%endif %endif
%if 0%{?fedora} > 38 %if 0%{?fedora} > 40 || 0%{?rhel} > 10
rm %{buildroot}%{confdir}/%{name}.conf rm %{buildroot}%{confdir}/%{name}.conf
%endif %endif
@ -290,13 +290,13 @@ popd
%dir %{confdir}/modules.d %dir %{confdir}/modules.d
%dir %{confdir}/modules.defaults.d %dir %{confdir}/modules.defaults.d
%dir %{pluginconfpath} %dir %{pluginconfpath}
%if 0%{?fedora} <= 38 %if ! (0%{?fedora} > 40 || 0%{?rhel} > 10)
%dir %{confdir}/protected.d %dir %{confdir}/protected.d
%dir %{confdir}/vars %dir %{confdir}/vars
%endif %endif
%dir %{confdir}/aliases.d %dir %{confdir}/aliases.d
%exclude %{confdir}/aliases.d/zypper.conf %exclude %{confdir}/aliases.d/zypper.conf
%if 0%{?fedora} <= 38 %if ! (0%{?fedora} > 40 || 0%{?rhel} > 10)
%config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/%{name}.conf
%endif %endif
@ -380,6 +380,9 @@ popd
%{python3_sitelib}/%{name}/automatic/ %{python3_sitelib}/%{name}/automatic/
%changelog %changelog
* Fri Aug 04 2023 Jan Kolarik <jkolarik@redhat.com> - 4.16.2-2
- Revert DNF obsoletion
* Thu Jul 27 2023 Nicola Sella <nsella@redhat.com> - 4.16.2-1 * Thu Jul 27 2023 Nicola Sella <nsella@redhat.com> - 4.16.2-1
- Update to 4.16.2 - Update to 4.16.2
- depend on /etc/dnf/dnf.conf, not libdnf5 - depend on /etc/dnf/dnf.conf, not libdnf5