From 02b9a804d70cb98eca79a2653ba5f4f2eefc4f87babd1057ec611ef87fe6b876 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 26 Nov 2020 22:11:54 +0000 Subject: [PATCH] Accepting request 850115 from devel:tools:scm OBS-URL: https://build.opensuse.org/request/show/850115 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=256 --- git.changes | 7 ++++++- git.spec | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/git.changes b/git.changes index d675d22..2700027 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 20 21:53:07 UTC 2020 - Marcus Rueckert + +- only pull asciidoctor for the default ruby version + ------------------------------------------------------------------- Thu Oct 29 23:07:17 UTC 2020 - Andreas Stieger @@ -111,7 +116,7 @@ Fri Apr 17 17:56:32 UTC 2020 - Michal Suchanek ------------------------------------------------------------------- Tue Apr 14 18:32:57 UTC 2020 - Andreas Stieger -- git 2.26.1: +- git 2.26.1: (boo#1168930) * CVE-2020-5260: Specially crafted URLs with newline characters could have been used to make the Git client to send credential information for a wrong host to the attacker's site boo#1168930 diff --git a/git.spec b/git.spec index 6fea61d..49552cd 100644 --- a/git.spec +++ b/git.spec @@ -16,6 +16,9 @@ # +%define rb_build_ruby_abis %{rb_default_ruby_abi} +%define rb_build_versions %{rb_default_ruby} + %define gitexecdir %{_libexecdir}/git %if 0%{?suse_version} < 1500 %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services @@ -89,7 +92,7 @@ BuildRequires: sgml-skel BuildRequires: xmlto %if %{with asciidoctor} BuildRequires: docbook5-xsl-stylesheets -BuildRequires: rubygem(asciidoctor) +BuildRequires: %{rubygem asciidoctor} %else BuildRequires: asciidoc %endif