From 316c10fc55b2f901e38ec5c4d810140ad50e4eac Mon Sep 17 00:00:00 2001 From: Anonymous_Z Date: Thu, 27 Feb 2020 19:55:32 +0800 Subject: [PATCH] remove extra brace --- backport-remove-extra-brace.patch | 23 +++++++++++++++++++++++ dnf.spec | 11 +++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 backport-remove-extra-brace.patch diff --git a/backport-remove-extra-brace.patch b/backport-remove-extra-brace.patch new file mode 100644 index 0000000..3e9554a --- /dev/null +++ b/backport-remove-extra-brace.patch @@ -0,0 +1,23 @@ +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/dnf.spec b/dnf.spec index fe913c6..e2d2325 100644 --- a/dnf.spec +++ b/dnf.spec @@ -6,15 +6,15 @@ Name: dnf Version: 4.2.15 -Release: 5 +Release: 6 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 -Patch9000: Bugfix-format-problem.patch - -Patch6000: backport-Revert-Fix-messages-for-starting-and-failing-scriptlets.patch +Patch6000: Bugfix-format-problem.patch +Patch6001: backport-Revert-Fix-messages-for-starting-and-failing-scriptlets.patch +Patch6002: backport-remove-extra-brace.patch BuildArch: noarch BuildRequires: cmake gettext systemd bash-completion %{_bindir}/sphinx-build-3 @@ -203,6 +203,9 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %{_mandir}/man8/%{name}-automatic.8* %changelog +* Thu Feb 27 2020 openEuler Buildteam - 4.2.15-6 +- remove extra brace + * Mon Feb 24 2020 openEuler Buildteam - 4.2.15-5 - Revert Fix messages for starting and failing scriptlets