X-Recipient:	archive-cygwin AT delorie DOT com
DomainKey-Signature:	a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:from:to:subject:date:message-id:in-reply-to
	:references; q=dns; s=default; b=yefk0aDEcQ0azH31m4m3k3bRZlxiHTE
	EOm5I2OZeaMbZork0eqGdleecI1LoCWiruL192C4thaDF8Z1h63/5m4XRqlsZu2c
	rH4DJ8YNoG8cEXzWU3nPpeZdPIA/nXK1U9vK8hEqCcA7xM0xGqweId+x537qRxCA
	1B5wXfT2g+Ws=
DKIM-Signature:	v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:from:to:subject:date:message-id:in-reply-to
	:references; s=default; bh=p0jDCIRoM3e0M6ZvhRNI5NwQYnU=; b=FHPY8
	nDLvfXhw7nc6+Zba+zws5YIMhREDDo578LxSiYWro+gXeXYaq2kZAJ4NXx3ZMPbo
	UVfKtJfUwlyb0XQd3d7cjB6C0fiBVvgmx5s/LZyG1qVF8cpi5ANsSOzaa0/IEld2
	B4ZmRn0tA6kCYAUI5GdcDV/QwNHjz01ZO3iIic=
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
Authentication-Results:	sourceware.org; auth=none
X-Virus-Found:	No
X-Spam-SWARE-Status:	No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=python2, bashcompletion, bash-completion, cygutils
X-HELO:	mx1.redhat.com
DMARC-Filter:	OpenDMARC Filter v1.3.2 mx1.redhat.com 3C51C37E66
Authentication-Results:	ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results:	ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=yselkowi AT redhat DOT com
DKIM-Filter:	OpenDKIM Filter v2.11.0 mx1.redhat.com 3C51C37E66
From:	Yaakov Selkowitz <yselkowi AT redhat DOT com>
To:	cygwin AT cygwin DOT com
Subject:	[PATCH git] Separate git-p4 subpackage
Date:	Thu, 15 Jun 2017 11:41:00 -0500
Message-Id:	<20170615164100.36820-1-yselkowi@redhat.com>
In-Reply-To:	<20170613102245.GH25777@dinwoodie.org>
References:	<20170613102245 DOT GH25777 AT dinwoodie DOT org>

This removes the python2 dependency from the main git package:

https://cygwin.com/ml/cygwin/2017-06/msg00135.html
---
 git.cygport | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/git.cygport b/git.cygport
index bc63458..679ab3f 100644
--- a/git.cygport
+++ b/git.cygport
@@ -9,7 +9,7 @@ inherit perl
 
 NAME="git"
 VERSION=2.12.3
-RELEASE=1
+RELEASE=2
 CATEGORY="Devel"
 SUMMARY="Distributed version control system"
 DESCRIPTION="Git is a free and open source distributed version control system
@@ -59,11 +59,11 @@ DEPEND="
 
 BASH_COMPLETION_DIR="$(pkg-config --variable=completionsdir bash-completion)"
 
-PKG_NAMES="git gitk gitweb git-cvs git-email git-gui git-svn"
+PKG_NAMES="git gitk gitweb git-cvs git-email git-gui git-p4 git-svn"
 git_REQUIRES="cygutils less openssh rsync"
 git_CONTENTS="--exclude=gitk* --exclude=git-cvs* --exclude=git-*email*
 	--exclude=git-gui* --exclude=git-svn* --exclude=SVN* --exclude=Git.SVN.*
-	--exclude=git-instaweb* --exclude=gitweb*
+	--exclude=git-instaweb* --exclude=gitweb* --exclude=*p4*
 	usr/bin/ usr/libexec/git-core/ ${PERL_VENDORLIB#/} ${PYTHON_SITELIB#/} usr/share/"
 git_OBSOLETES="git-completion"
 gitk_SUMMARY="Git repository browser"
@@ -85,6 +85,10 @@ git_gui_SUMMARY="Graphical interface for Git version control system"
 git_gui_REQUIRES="git gitk"
 git_gui_CONTENTS="usr/libexec/git-core/git-gui* usr/share/doc/git/html/git-gui*
 	usr/share/git-gui/ usr/share/man/man1/git-gui.1*"
+git_p4_SUMMARY="Perforce compatibility support for Git version control system"
+git_p4_REQUIRES="git"
+git_p4_CONTENTS="usr/libexec/git-core/git-p4 usr/libexec/git-core/mergetools/p4merge
+	usr/share/doc/git/html/git-p4* usr/share/man/man1/git-p4.1*"
 git_svn_SUMMARY="Subversion compatibility support for Git version control system"
 git_svn_CONTENTS="usr/libexec/git-core/git-svn ${PERL_VENDORLIB#/}/Git/SVN*
 	usr/share/doc/git/html/git-svn* usr/share/man/man1/git-svn.1*
-- 
2.12.3


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

- Raw text -