From 7d0792e5ae7793afa79b41ae54626acbc903365f5868ea51004c7d462ab24d6b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sun, 19 Nov 2017 10:10:40 +0000
Subject: [PATCH] Accepting request 542209 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/542209
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=208
---
 git.changes |  8 ++++++++
 git.spec    | 29 +++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/git.changes b/git.changes
index 2b369b2..6a1b962 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov  9 18:46:12 UTC 2017 - jmatejek@suse.com
+
+- split off p4 to a subpackage (bsc#1067502)
+- do not buildrequire asciidoc (dependent on Python 2) when
+  not building docs
+- switch to Python 3 for tests
+
 -------------------------------------------------------------------
 Mon Nov  6 15:47:22 CET 2017 - tiwai@suse.de
 
diff --git a/git.spec b/git.spec
index ab6b602..fda6853 100644
--- a/git.spec
+++ b/git.spec
@@ -25,6 +25,8 @@
 %bcond_with git_gnome_keyring 
 %endif
 
+%bcond_without docs
+
 Name:           git
 Version:        2.15.0
 Release:        0
@@ -57,7 +59,9 @@ Patch8:         git-asciidoc.patch
 Patch9:         git-gui-tclIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
+%if %{with docs}
 BuildRequires:  asciidoc
+%endif
 BuildRequires:  curl
 BuildRequires:  fdupes
 BuildRequires:  gpg2
@@ -72,7 +76,7 @@ BuildRequires:  libsha1detectcoll-devel
 %endif
 BuildRequires:  pcre2-devel
 BuildRequires:  perl-Error
-BuildRequires:  python
+BuildRequires:  python3
 BuildRequires:  sgml-skel
 BuildRequires:  tcsh
 BuildRequires:  update-desktop-files
@@ -177,6 +181,16 @@ Requires:       git-core = %{version}
 Tools for importing GNU Arch repositories to the GIT version control
 system.
 
+%package p4
+Summary:        Git tools for importing Perforce repositories
+Group:          Development/Tools/Version Control
+Requires:       git-core = %{version}
+Requires:       python2-base
+
+%description p4
+Tools for importing Perforce repositories to the GIT version control
+system.
+
 %package email
 Summary:        Git tools for sending email
 Group:          Development/Tools/Version Control
@@ -265,6 +279,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
 %if 0%{?suse_version} > 1320
        DC_SHA1_EXTERNAL=YesPlease \
 %endif
+       PYTHON_PATH=%{_bindir}/python3 \
        USE_LIBPCRE2=YesPlease \
        V=1 \
        prefix=%{_prefix} mandir=%{_mandir} \
@@ -305,9 +320,9 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
 ###
 ./.make -C contrib/subtree install
 %{!?_without_docs: ./.make -C contrib/subtree install-doc}
-(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)                   > bin-man-doc-files
-(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
-(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)                   > bin-man-doc-files
+(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
 ( pushd perl
   perl Makefile.PL
   make -f perl.mak DESTDIR=%{buildroot}  install_vendor
@@ -417,6 +432,12 @@ fi
 %{gitexecdir}/git-archimport
 %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
 
+%files p4
+%defattr(-,root,root)
+%{gitexecdir}/git-p4
+%{gitexecdir}/mergetools/p4merge
+%{!?_without_docs: %{_mandir}/man1/git-p4.1*}
+
 %files email
 %defattr(-,root,root)
 %{gitexecdir}/*email*