From 890007cdfd595b9a70a79c4da51e5320e531c370d7495fa8c0fe253ac29cee62 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 14 Nov 2017 13:44:28 +0000 Subject: [PATCH] Accepting request 539445 from devel:tools:scm OBS-URL: https://build.opensuse.org/request/show/539445 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=207 --- git.changes | 5 +++++ git.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/git.changes b/git.changes index fcd4de6..2b369b2 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 6 15:47:22 CET 2017 - tiwai@suse.de + +- Build with the external libsha1detectcoll (bsc#1042644) + ------------------------------------------------------------------- Wed Nov 1 13:10:43 UTC 2017 - astieger@suse.com diff --git a/git.spec b/git.spec index cd1a42a..ab6b602 100644 --- a/git.spec +++ b/git.spec @@ -67,6 +67,9 @@ BuildRequires: libexpat-devel BuildRequires: libgnome-keyring-devel %endif BuildRequires: libopenssl-devel +%if 0%{?suse_version} > 1320 +BuildRequires: libsha1detectcoll-devel +%endif BuildRequires: pcre2-devel BuildRequires: perl-Error BuildRequires: python @@ -259,6 +262,9 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ DESTDIR=$RPM_BUILD_ROOT \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ NO_INSTALL_HARDLINKS=1 \ +%if 0%{?suse_version} > 1320 + DC_SHA1_EXTERNAL=YesPlease \ +%endif USE_LIBPCRE2=YesPlease \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \