diff --git a/Bugfix-format-problem.patch b/Bugfix-format-problem.patch deleted file mode 100644 index b7736ee..0000000 --- a/Bugfix-format-problem.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp a/dnf/base.py b/dnf/base.py ---- a/dnf/base.py 2019-11-05 17:26:35.000000000 +0800 -+++ b/dnf/base.py 2020-01-17 09:10:06.178837683 +0800 -@@ -442,7 +442,7 @@ class Base(object): - logger.info(_("The downloaded packages were saved in cache " - "until the next successful transaction.")) - logger.info(_("You can remove cached packages by executing " -- "'%s'."), "{prog} clean packages").format(prog=dnf.util.MAIN_PROG) -+ "'%s'."), "{prog} clean packages".format(prog=dnf.util.MAIN_PROG)) - - # Do not trigger the lazy creation: - if self._history is not None: diff --git a/Remove-extra-brace.patch b/Remove-extra-brace.patch deleted file mode 100644 index 3e9554a..0000000 --- a/Remove-extra-brace.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6803740429c072617ad8f4e82f4d84f1662624bd Mon Sep 17 00:00:00 2001 -From: Yuri Chornoivan -Date: Tue, 5 Nov 2019 13:21:42 +0200 -Subject: [PATCH] Remove extra brace - -Thanks in advance for fixing this issue ---- - dnf/cli/commands/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/cli/commands/__init__.py b/dnf/cli/commands/__init__.py -index 83ba24ea98..ad53481dcb 100644 ---- a/dnf/cli/commands/__init__.py -+++ b/dnf/cli/commands/__init__.py -@@ -58,7 +58,7 @@ - - - Alternatively you can specify the url to the key you would like to use --for a repository in the 'gpgkey' option in a repository section and {prog}} -+for a repository in the 'gpgkey' option in a repository section and {prog} - will install it for you. - - For more information contact your distribution or package provider.""") diff --git a/Revert-Fix-messages-for-starting-and-failing-scriptlets.patch b/Revert-Fix-messages-for-starting-and-failing-scriptlets.patch deleted file mode 100644 index b6f8cd7..0000000 --- a/Revert-Fix-messages-for-starting-and-failing-scriptlets.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 6ba90e26497b01a0913f9ec8e66c6bc9500133df Mon Sep 17 00:00:00 2001 -From: fengtao -Date: Mon, 24 Feb 2020 10:07:51 +0800 -Subject: [PATCH] tmp fix - ---- - dnf/yum/rpmtrans.py | 35 +++++------------------------------ - 1 file changed, 5 insertions(+), 30 deletions(-) - -diff --git a/dnf/yum/rpmtrans.py b/dnf/yum/rpmtrans.py -index 58c6101..6033309 100644 ---- a/dnf/yum/rpmtrans.py -+++ b/dnf/yum/rpmtrans.py -@@ -391,21 +391,9 @@ class RPMTransaction(object): - scriptlet_name = rpm.tagnames.get(amount, "") - - transaction_list = self._extract_cbkey(key) -- pkg_currenly_being_handled = transaction_list[0].pkg -+ name = transaction_list[0].pkg.name - -- if hasattr(key, "name"): -- pkg_which_owns_this_scriptlet_name = key.name -- else: -- pkg_which_owns_this_scriptlet_name = key -- -- # In case rpm trigger runs scriptlet of some other package -- if pkg_which_owns_this_scriptlet_name != pkg_currenly_being_handled.name: -- msg = ("Error in %s scriptlet in rpm package %s triggered by rpm package %s" -- % (scriptlet_name, pkg_which_owns_this_scriptlet_name, -- pkg_currenly_being_handled)) -- else: -- msg = ("Error in %s scriptlet in rpm package %s" -- % (scriptlet_name, pkg_currenly_being_handled)) -+ msg = ("Error in %s scriptlet in rpm package %s" % (scriptlet_name, name)) - - for display in self.displays: - display.error(msg) -@@ -414,29 +402,16 @@ class RPMTransaction(object): - # TODO: this doesn't fit into libdnf TransactionItem use cases - action = dnf.transaction.PKG_SCRIPTLET - if key is None and self._te_list == []: -- pkg_currenly_being_handled = 'None' -+ pkg = 'None' - else: - transaction_list = self._extract_cbkey(key) -- pkg_currenly_being_handled = transaction_list[0].pkg -+ pkg = transaction_list[0].pkg - complete = self.complete_actions if self.total_actions != 0 and self.complete_actions != 0 \ - else 1 - total = self.total_actions if self.total_actions != 0 and self.complete_actions != 0 else 1 - -- if hasattr(key, "name"): -- pkg_which_owns_this_scriptlet_name = key.name -- else: -- pkg_which_owns_this_scriptlet_name = key -- -- # In case rpm trigger runs scriptlet of some other package -- if pkg_which_owns_this_scriptlet_name != pkg_currenly_being_handled.name: -- # Show only the pkg name, because we don't have the full nevra -- # and if we search for the pkg we could show misleding information -- pkg_or_key = pkg_which_owns_this_scriptlet_name -- else: -- pkg_or_key = pkg_currenly_being_handled -- - for display in self.displays: -- display.progress(pkg_or_key, action, 100, 100, complete, total) -+ display.progress(pkg, action, 100, 100, complete, total) - - def _scriptStop(self): - self._scriptout() --- -1.8.3.1 - diff --git a/dnf-4.2.15.tar.gz b/dnf-4.2.15.tar.gz deleted file mode 100644 index 1626fd7..0000000 Binary files a/dnf-4.2.15.tar.gz and /dev/null differ diff --git a/dnf-4.2.23.tar.gz b/dnf-4.2.23.tar.gz new file mode 100644 index 0000000..59562f7 Binary files /dev/null and b/dnf-4.2.23.tar.gz differ diff --git a/dnf.spec b/dnf.spec index 07f693d..f0cfda7 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,23 +1,15 @@ -%bcond_without python3 - -%if %{with python3} - %global py3pluginpath %{python3_sitelib}/%{name}-plugins -%endif +%global py3pluginpath %{python3_sitelib}/%{name}-plugins Name: dnf -Version: 4.2.15 -Release: 8 +Version: 4.2.23 +Release: 1 Summary: A software package manager that manages packages on Linux distributions. License: GPLv2+ and GPLv2 and GPL URL: https://github.com/rpm-software-management/dnf Source0: https://github.com/rpm-software-management/dnf/archive/%{version}/%{name}-%{version}.tar.gz -Patch6000: Bugfix-format-problem.patch -Patch6001: Revert-Fix-messages-for-starting-and-failing-scriptlets.patch -Patch6002: Remove-extra-brace.patch - BuildArch: noarch -BuildRequires: cmake gettext systemd bash-completion %{_bindir}/sphinx-build-3 +BuildRequires: cmake gettext systemd bash-completion python3-sphinx Requires: python3-%{name} = %{version}-%{release} libreport-filesystem Recommends: (%{_bindir}/sqlite3 if bash-completion) (python3-dbus if NetworkManager) Provides: dnf-command(alias) dnf-command(autoremove) dnf-command(check-update) dnf-command(clean) @@ -26,7 +18,7 @@ Provides: dnf-command(info) dnf-command(install) dnf-command(list) d Provides: dnf-command(mark) dnf-command(provides) dnf-command(reinstall) dnf-command(remove) Provides: dnf-command(repolist) dnf-command(repoquery) dnf-command(repository-packages) Provides: dnf-command(search) dnf-command(updateinfo) dnf-command(upgrade) dnf-command(upgrade-to) -Conflicts: python2-dnf-plugins-core < 4.0.6 python3-dnf-plugins-core < 4.0.6 +Conflicts: python2-dnf-plugins-core < 4.0.16 python3-dnf-plugins-core < 4.0.16 Provides: dnf-data %{name}-conf = %{version}-%{release} %{name}-automatic = %{version}-%{release} Obsoletes: dnf-data %{name}-conf < %{version}-%{release} %{name}-automatic < %{version}-%{release} @@ -39,7 +31,7 @@ one using rpm. %package -n yum Requires: %{name} = %{version}-%{release} -Summary: Package manager +Summary: Package manager %description -n yum Utility that allows users to manage packages on their systems.\ @@ -48,11 +40,11 @@ It supports RPMs, modules and comps groups & environments. %package -n python3-%{name} Summary: Python 3 interface to DNF %{?python_provide:%python_provide python3-%{name}} -BuildRequires: python3-devel python3-hawkey >= 0.37.0 python3-libdnf >= 0.37.0 +BuildRequires: python3-devel python3-hawkey >= 0.48.0 python3-libdnf >= 0.48.0 BuildRequires: python3-libcomps >= 0.1.8 python3-libdnf libmodulemd >= 1.4.0 BuildRequires: python3-nose python3-gpg python3-rpm >= 4.14.0 Requires: python3-gpg %{name}-data = %{version}-%{release} libmodulemd >= 1.4.0 -Requires: deltarpm python3-hawkey >= 0.37.0 python3-libdnf >= 0.37.0 +Requires: deltarpm python3-hawkey >= 0.48.0 python3-libdnf >= 0.48.0 Requires: python3-libcomps >= 0.1.8 python3-libdnf python3-rpm >= 4.14.0 Recommends: python3-unbound rpm-plugin-systemd-inhibit Obsoletes: python2-%{name} @@ -64,23 +56,18 @@ Python 3 interface to DNF. %prep %autosetup -p1 -mkdir build-py2 mkdir build-py3 %build -%if %{with python3} - pushd build-py3 - %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} - %make_build all doc-man - popd -%endif +pushd build-py3 +%cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} +%make_build all doc-man +popd %install -%if %{with python3} - pushd build-py3 - %make_install - popd -%endif +pushd build-py3 +%make_install +popd %find_lang %{name} mkdir -p %{buildroot}%{_sysconfdir}/%{name}/vars @@ -105,11 +92,9 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/protected.d %{buildroot}%{_sysconfdir ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/vars %check -%if %{with python3} - pushd build-py3 - ctest -VV - popd -%endif +pushd build-py3 +ctest -VV +popd %post %systemd_post dnf-makecache.timer @@ -181,14 +166,12 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %{_sysconfdir}/yum/protected.d %config(noreplace) %{_sysconfdir}/%{name}/protected.d/yum.conf -%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 help %{_datadir}/locale/* @@ -204,6 +187,12 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %{_mandir}/man8/%{name}-automatic.8* %changelog +* Tue Apr 28 2020 zhouyihang - 4.2.23-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update dnf version to 4.2.23 + * Wed Mar 18 2020 songnannan - 4.2.15-8 - add obsoletes the python2-dnf