Update to 4.17.0

This commit is contained in:
Jan Kolarik 2023-09-01 11:04:41 +02:00
parent 3fd889b17b
commit 684c8f18ec
3 changed files with 23 additions and 14 deletions

1
.gitignore vendored
View File

@ -158,3 +158,4 @@
/dnf-4.16.0.tar.gz /dnf-4.16.0.tar.gz
/dnf-4.16.1.tar.gz /dnf-4.16.1.tar.gz
/dnf-4.16.2.tar.gz /dnf-4.16.2.tar.gz
/dnf-4.17.0.tar.gz

View File

@ -2,10 +2,10 @@
%define __cmake_in_source_build 1 %define __cmake_in_source_build 1
# default dependencies # default dependencies
%global hawkey_version 0.66.0 %global hawkey_version 0.71.0
%global libcomps_version 0.1.8 %global libcomps_version 0.1.8
%global libmodulemd_version 2.9.3 %global libmodulemd_version 2.9.3
%global rpm_version 4.14.0 %global rpm_version 4.18.0
# conflicts # conflicts
%global conflicts_dnf_plugins_core_version 4.0.26 %global conflicts_dnf_plugins_core_version 4.0.26
@ -67,8 +67,8 @@
It supports RPMs, modules and comps groups & environments. It supports RPMs, modules and comps groups & environments.
Name: dnf Name: dnf
Version: 4.16.2 Version: 4.17.0
Release: 4%{?dist} Release: 1%{?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
@ -130,8 +130,6 @@ BuildRequires: python3-libcomps >= %{libcomps_version}
BuildRequires: python3-libdnf BuildRequires: python3-libdnf
BuildRequires: libmodulemd >= %{libmodulemd_version} BuildRequires: libmodulemd >= %{libmodulemd_version}
Requires: libmodulemd >= %{libmodulemd_version} Requires: libmodulemd >= %{libmodulemd_version}
BuildRequires: python3-gpg
Requires: python3-gpg
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
%if 0%{?fedora} %if 0%{?fedora}
Recommends: deltarpm Recommends: deltarpm
@ -299,15 +297,10 @@ popd
%dir %{confdir}/aliases.d %dir %{confdir}/aliases.d
%exclude %{confdir}/aliases.d/zypper.conf %exclude %{confdir}/aliases.d/zypper.conf
%if %{without dnf5_obsoletes_dnf} %if %{without dnf5_obsoletes_dnf}
# If DNF5 does not obsolete DNF ownership of dnf.conf should be DNF's
%config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/%{name}.conf
%endif %endif
%config(noreplace) %{confdir}/protected.d/%{name}.conf
# No longer using `noreplace` here. Older versions of DNF 4 marked `dnf` as a
# protected package, but since Fedora 39, DNF needs to be able to update itself
# to DNF 5, so we need to replace the old /etc/dnf/protected.d/dnf.conf.
%config %{confdir}/protected.d/%{name}.conf
# Protect python3-dnf instead, which does not conflict with DNF 5
%config(noreplace) %{confdir}/protected.d/python3-%{name}.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%ghost %attr(644,-,-) %{_localstatedir}/log/hawkey.log %ghost %attr(644,-,-) %{_localstatedir}/log/hawkey.log
%ghost %attr(644,-,-) %{_localstatedir}/log/%{name}.log %ghost %attr(644,-,-) %{_localstatedir}/log/%{name}.log
@ -333,10 +326,16 @@ popd
%{_mandir}/man5/yum.conf.5.* %{_mandir}/man5/yum.conf.5.*
%{_mandir}/man8/yum-shell.8* %{_mandir}/man8/yum-shell.8*
%{_mandir}/man1/yum-aliases.1* %{_mandir}/man1/yum-aliases.1*
%if %{without dnf5_obsoletes_dnf}
# If DNF5 does not obsolete DNF, protected.d/yum.conf should be owned by DNF
%config(noreplace) %{confdir}/protected.d/yum.conf
%else
# If DNF5 obsoletes DNF
# No longer using `noreplace` here. Older versions of DNF 4 marked `yum` as a # No longer using `noreplace` here. Older versions of DNF 4 marked `yum` as a
# protected package, but since Fedora 39, DNF needs to be able to update itself # protected package, but since Fedora 39, DNF needs to be able to update itself
# to DNF 5, so we need to replace the old /etc/dnf/protected.d/yum.conf. # to DNF 5, so we need to replace the old /etc/dnf/protected.d/yum.conf.
%config %{confdir}/protected.d/yum.conf %config %{confdir}/protected.d/yum.conf
%endif
%else %else
%exclude %{_sysconfdir}/yum.conf %exclude %{_sysconfdir}/yum.conf
%exclude %{_sysconfdir}/yum/pluginconf.d %exclude %{_sysconfdir}/yum/pluginconf.d
@ -382,6 +381,15 @@ popd
%{python3_sitelib}/%{name}/automatic/ %{python3_sitelib}/%{name}/automatic/
%changelog %changelog
* Fri Sep 01 2023 Jan Kolarik <jkolarik@redhat.com> - 4.17.0-1
- Update to 4.17.0
- crypto: Use libdnf crypto API instead of using GnuPG/GpgME
- Reprotect dnf, unprotect python3-dnf (RhBug:2221905)
- Block signals during RPM transaction processing (RhBug:2133398)
- Fix bash completion due to sqlite changes (RhBug:2232052)
- automatic: allow use of STARTTLS/TLS
- automatic: use email_port specified in config
* Wed Aug 16 2023 Jan Kolarik <jkolarik@redhat.com> - 4.16.2-4 * Wed Aug 16 2023 Jan Kolarik <jkolarik@redhat.com> - 4.16.2-4
- Fixes of conditions in spec file - Fixes of conditions in spec file

View File

@ -1 +1 @@
SHA512 (dnf-4.16.2.tar.gz) = 2a4cad1594c6f6f51958a7cb04632d3d4dee9df99cd29c68fa937b505fe348531cf3b1e89722563a20970dc1a301f7d2171976d92d6d702d761faa8c5af99313 SHA512 (dnf-4.17.0.tar.gz) = d9d18bb5e3e0bdd77221ff886569a3210288c4fabb536c90b476351b5f53f443be86a4b4c086da168dde48718382bb1427bc9259a3241266847c7bb0940bdfb9