From 49b579271fd6fed83ad694adbbef03df1a1203cd Mon Sep 17 00:00:00 2001 From: Nicola Sella Date: Tue, 2 Mar 2021 15:11:38 +0100 Subject: [PATCH] Update to 4.6.1 --- .gitignore | 1 + dnf.spec | 182 +++++++++++------------------------------------------ sources | 2 +- 3 files changed, 37 insertions(+), 148 deletions(-) diff --git a/.gitignore b/.gitignore index 686653d..bfdb48e 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ /dnf-4.5.1.tar.gz /dnf-4.5.2.tar.gz /dnf-4.6.0.tar.gz +/dnf-4.6.1.tar.gz diff --git a/dnf.spec b/dnf.spec index 9aeeb87..32508e0 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,8 +1,8 @@ # Always build out-of-source -%undefine __cmake_in_source_build +%define __cmake_in_source_build 1 # default dependencies -%global hawkey_version 0.57.0 +%global hawkey_version 0.59.0 %global libcomps_version 0.1.8 %global libmodulemd_version 2.9.3 %global rpm_version 4.14.0 @@ -27,19 +27,6 @@ %endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with python3 -%else -%bcond_without python3 -%endif - -%if 0%{?rhel} >= 8 || 0%{?fedora} > 29 -# Disable python2 build -%bcond_with python2 -%else -%bcond_without python2 -%endif - # YUM compat subpackage configuration # # level=full -> deploy all compat symlinks (conflicts with yum < 4) @@ -67,13 +54,7 @@ %global confdir %{_sysconfdir}/%{name} %global pluginconfpath %{confdir}/plugins -%if %{with python2} - %global py2pluginpath %{python2_sitelib}/%{name}-plugins -%endif - -%if %{with python3} - %global py3pluginpath %{python3_sitelib}/%{name}-plugins -%endif +%global py3pluginpath %{python3_sitelib}/%{name}-plugins # Use the same directory of the main package for subpackage licence and docs %global _docdir_fmt %{name} @@ -84,7 +65,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf -Version: 4.6.0 +Version: 4.6.1 Release: 1%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -97,22 +78,13 @@ BuildRequires: gettext # Documentation BuildRequires: systemd BuildRequires: bash-completion -%if %{with python3} BuildRequires: %{_bindir}/sphinx-build-3 Requires: python3-%{name} = %{version}-%{release} -%else -BuildRequires: %{_bindir}/sphinx-build -Requires: python2-%{name} = %{version}-%{release} -%endif %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-dbus Requires: %{_bindir}/sqlite3 %else -%if %{with python3} Recommends: (python3-dbus if NetworkManager) -%else -Recommends: (python2-dbus if NetworkManager) -%endif Recommends: (%{_bindir}/sqlite3 if bash-completion) %endif Provides: dnf-command(alias) @@ -138,9 +110,7 @@ Provides: dnf-command(search) Provides: dnf-command(updateinfo) Provides: dnf-command(upgrade) Provides: dnf-command(upgrade-to) -Conflicts: python2-dnf-plugins-core < %{conflicts_dnf_plugins_core_version} Conflicts: python3-dnf-plugins-core < %{conflicts_dnf_plugins_core_version} -Conflicts: python2-dnf-plugins-extras-common < %{conflicts_dnf_plugins_extras_version} Conflicts: python3-dnf-plugins-extras-common < %{conflicts_dnf_plugins_extras_version} %description @@ -170,55 +140,6 @@ Conflicts: yum < 3.4.3-505 %description -n %{yum_subpackage_name} %{pkg_description} -%if %{with python2} -%package -n python2-%{name} -Summary: Python 2 interface to DNF -%{?python_provide:%python_provide python2-%{name}} -BuildRequires: python2-devel -BuildRequires: python2-hawkey >= %{hawkey_version} -BuildRequires: python2-libdnf >= %{hawkey_version} -BuildRequires: python2-libcomps >= %{libcomps_version} -BuildRequires: python2-libdnf -BuildRequires: python2-nose -BuildRequires: libmodulemd >= %{libmodulemd_version} -Requires: libmodulemd >= %{libmodulemd_version} -%if (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: pygpgme -Requires: pygpgme -BuildRequires: python-enum34 -Requires: python-enum34 -%else -BuildRequires: python2-gpg -Requires: python2-gpg -BuildRequires: python2-enum34 -Requires: python2-enum34 -%endif -Requires: %{name}-data = %{version}-%{release} -%if 0%{?fedora} -Recommends: deltarpm -# required for DNSSEC main.gpgkey_dns_verification https://dnf.readthedocs.io/en/latest/conf_ref.html -Recommends: python2-unbound -%endif -Requires: python2-hawkey >= %{hawkey_version} -Requires: python2-libdnf >= %{hawkey_version} -Requires: python2-libcomps >= %{libcomps_version} -Requires: python2-libdnf -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: rpm-python >= %{rpm_version} -Requires: rpm-python >= %{rpm_version} -%else -BuildRequires: python2-rpm >= %{rpm_version} -Requires: python2-rpm >= %{rpm_version} -Recommends: rpm-plugin-systemd-inhibit -%endif -Conflicts: dnfdaemon < %{conflicts_dnfdaemon_version} - -%description -n python2-%{name} -Python 2 interface to DNF. -%endif -# ^ %%{with python2} - -%if %{with python3} %package -n python3-%{name} Summary: Python 3 interface to DNF %{?python_provide:%python_provide python3-%{name}} @@ -252,7 +173,6 @@ Recommends: rpm-plugin-systemd-inhibit %description -n python3-%{name} Python 3 interface to DNF. -%endif %package automatic Summary: %{pkg_summary} - automated upgrades @@ -267,33 +187,21 @@ Systemd units that can periodically download package upgrades and apply them. %prep %autosetup -p1 +mkdir build-py3 %build -%if %{with python2} - %global _vpath_builddir build-py2 - %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} -DDNF_VERSION=%{version} - %cmake_build - %cmake_build --target doc-man -%endif - -%if %{with python3} - %global _vpath_builddir build-py3 - %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} -DDNF_VERSION=%{version} - %cmake_build - %cmake_build --target doc-man -%endif +pushd build-py3 +%cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} -DDNF_VERSION=%{version} +%make_build +make doc-man +popd %install -%if %{with python2} - %global _vpath_builddir build-py2 - %cmake_install -%endif -%if %{with python3} - %global _vpath_builddir build-py3 - %cmake_install -%endif +pushd build-py3 +%make_install +popd %find_lang %{name} mkdir -p %{buildroot}%{confdir}/vars @@ -301,22 +209,12 @@ mkdir -p %{buildroot}%{confdir}/aliases.d mkdir -p %{buildroot}%{pluginconfpath}/ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.d mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.defaults.d -%if %{with python2} -mkdir -p %{buildroot}%{py2pluginpath}/ -%endif -%if %{with python3} mkdir -p %{buildroot}%{py3pluginpath}/__pycache__/ -%endif mkdir -p %{buildroot}%{_localstatedir}/log/ mkdir -p %{buildroot}%{_var}/cache/dnf/ touch %{buildroot}%{_localstatedir}/log/%{name}.log -%if %{with python3} ln -sr %{buildroot}%{_bindir}/dnf-3 %{buildroot}%{_bindir}/dnf mv %{buildroot}%{_bindir}/dnf-automatic-3 %{buildroot}%{_bindir}/dnf-automatic -%else -ln -sr %{buildroot}%{_bindir}/dnf-2 %{buildroot}%{_bindir}/dnf -mv %{buildroot}%{_bindir}/dnf-automatic-2 %{buildroot}%{_bindir}/dnf-automatic -%endif rm -vf %{buildroot}%{_bindir}/dnf-automatic-* # Strict conf distribution @@ -328,17 +226,7 @@ rm -vf %{buildroot}%{confdir}/%{name}-strict.conf # YUM compat layer ln -sr %{buildroot}%{confdir}/%{name}.conf %{buildroot}%{_sysconfdir}/yum.conf -%if %{with python3} ln -sr %{buildroot}%{_bindir}/dnf-3 %{buildroot}%{_bindir}/yum -%else -%if "%{yum_compat_level}" == "preview" -ln -sr %{buildroot}%{_bindir}/dnf-2 %{buildroot}%{_bindir}/yum4 -ln -sr %{buildroot}%{_mandir}/man8/dnf.8.gz %{buildroot}%{_mandir}/man8/yum4.8.gz -rm -f %{buildroot}%{_mandir}/man8/yum.8.gz -%else -ln -sr %{buildroot}%{_bindir}/dnf-2 %{buildroot}%{_bindir}/yum -%endif -%endif %if "%{yum_compat_level}" == "full" mkdir -p %{buildroot}%{_sysconfdir}/yum ln -sr %{buildroot}%{pluginconfpath} %{buildroot}%{_sysconfdir}/yum/pluginconf.d @@ -348,15 +236,10 @@ ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %check -%if %{with python2} - %global _vpath_builddir build-py2 - %ctest -%endif -%if %{with python3} - %global _vpath_builddir build-py3 - %ctest -%endif +pushd build-py3 +ctest -VV +popd %post @@ -466,22 +349,12 @@ ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %exclude %{_mandir}/man8/yum.8* %endif -%if %{with python2} -%files -n python2-%{name} -%{_bindir}/%{name}-2 -%exclude %{python2_sitelib}/%{name}/automatic -%{python2_sitelib}/%{name}/ -%dir %{py2pluginpath} -%endif - -%if %{with python3} %files -n python3-%{name} %{_bindir}/%{name}-3 %exclude %{python3_sitelib}/%{name}/automatic %{python3_sitelib}/%{name}/ %dir %{py3pluginpath} %dir %{py3pluginpath}/__pycache__ -%endif %files automatic %{_bindir}/%{name}-automatic @@ -495,13 +368,28 @@ ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %{_unitdir}/%{name}-automatic-download.timer %{_unitdir}/%{name}-automatic-install.service %{_unitdir}/%{name}-automatic-install.timer -%if %{with python3} %{python3_sitelib}/%{name}/automatic/ -%else -%{python2_sitelib}/%{name}/automatic/ -%endif %changelog +* Tue Mar 02 2021 Nicola Sella - 4.6.1-1 +- Update to 4.6.1 +- Fix recreate script +- Add unit test for fill_sack_from_repos_in_cache (RhBug:1865803) +- Add docs and examples for fill_sack_from_repos_in_cache (RhBug:1865803) +- [spec] remove python2 support +- Remove problematic language +- The noroot plugin no longer exists, remove mention +- Run tests for fill_sack_from_repos_in_cache in installroot (RhBug:1865803) +- expand history to full term size when output is redirected (RhBug:1852577) (RhBug:1852577,1906970) +- [doc] Fix: "sslcacert" contains path to the file +- [doc] Added proxy ssl configuration options, increase libdnf require +- Set persistdir and substitutions for fill_sack_from_repos_in_cache tests (RhBug:1865803) +- Update documentation for module_obsoletes and module_stream_switch +- print additional information when verifying GPG key using DNS +- Bugs fixed (RhBug:1897573) +- Remove hardcoded logfile permissions (RhBug:1910084) +- Enhanced detection of plugins removed in transaction (RhBug:1929163) + * Thu Jan 28 2021 Nicola Sella - 4.6.0-1 - Update to 4.6.0 - Log scriptlets output also for API users (RhBug:1847340) diff --git a/sources b/sources index c56f2a7..da4f7c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnf-4.6.0.tar.gz) = 1767f0ec6b29b76d492d8176aeaeb6caf03867647d85884d9b36e10c63f468440a369493fd3457ed629e868a068d090e6f699831c5c37b10fbed63bd795beefe +SHA512 (dnf-4.6.1.tar.gz) = 51977f1d3557614d811da149be23b7723acf12601af37a7e6dc6ef53af54571fccdb5ed166ebc258bdfe92658f2c63706fb790694686b40f5cdd388bc2dcc180