From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Aguilar Subject: Re: [RFH] rpm packaging failure Date: Sun, 31 Jan 2010 15:14:32 -0800 Message-ID: <20100131231430.GA10914@gmail.com> References: <7v8wbgueqz.fsf@alter.siamese.dyndns.org> <20100130151921.GM29188@inocybe.localdomain> <7vsk9nsemh.fsf@alter.siamese.dyndns.org> <20100130194746.GN29188@inocybe.localdomain> <7vd40rjks4.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Todd Zullinger , git@vger.kernel.org, Johan Herland , Sverre Rabbelier To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Feb 01 00:20:30 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nbj5i-00023X-7y for gcvg-git-2@lo.gmane.org; Mon, 01 Feb 2010 00:20:30 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753947Ab0AaXUY (ORCPT ); Sun, 31 Jan 2010 18:20:24 -0500 Received: from mail-yw0-f179.google.com ([209.85.211.179]:52843 "EHLO mail-yw0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753626Ab0AaXUX (ORCPT ); Sun, 31 Jan 2010 18:20:23 -0500 X-Greylist: delayed 343 seconds by postgrey-1.27 at vger.kernel.org; Sun, 31 Jan 2010 18:20:23 EST Received: by ywh9 with SMTP id 9so3889005ywh.19 for ; Sun, 31 Jan 2010 15:20:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=OEaokwF3d6D/B3hcLqnRarkSk8T9ZEtqWBTbEdRZ9Z0=; b=MGW+daYeheWg7vDD3z/WBU77qkikyM924aCH0UXTqcpjataRBSgZE95BbyDZ7akpj7 IMZoYgPZj4z+ZWTW5BoAcUSjyYLuPkmP1ba3s5SaTM0gp9dyR3UYDBDMOR4xbnFpftvW CIgkz0zvE2jcvpGVj2axjhVqv7+wJLpcY9Nwk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=sAVEf+zRUTfCQ8gi7TSPJqTtIcHB+kXaWdPTaVTI4OFsN4Z3s5q/6O5O3eEkwIhJub nrp3vYqvnpKewejy8iClZGzn/HvpCw58aTjfEx6zBhMr88TEg/pfNa/mgPDTlTUaUbM8 wJ2cliBXtO4zh474MKUdFtIlD66UDUgU5BjVQ= Received: by 10.101.56.18 with SMTP id i18mr871398ank.98.1264979678531; Sun, 31 Jan 2010 15:14:38 -0800 (PST) Received: from gmail.com ([12.183.88.10]) by mx.google.com with ESMTPS id 16sm2775290gxk.11.2010.01.31.15.14.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 31 Jan 2010 15:14:37 -0800 (PST) Content-Disposition: inline In-Reply-To: <7vd40rjks4.fsf@alter.siamese.dyndns.org> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Sat, Jan 30, 2010 at 02:22:03PM -0800, Junio C Hamano wrote: > Todd Zullinger writes: > > > Not shipping them if they aren't yet used/needed for anything other > > than folks working on remote helpers seems reasonable and the rm in > > the spec file should do the trick nicely. > > Thanks. > > To allow us to go forward a bit easier, I am planning to use the attached, > as we would need some parts of it when we do start generating a separate > package, I think. > > -- >8 -- > Subject: [PATCH] RPM packaging: don't include foreign-scm-helper bits yet > > The files in /usr/lib/python* are only the support infrastructure for > foreign scm interface yet to be written and/or shipped with git. Don't > include them in the binary package (this will also free us from Python > dependency). > > When we ship with foreign scm interface, we will need to package these > files with it in a separate subpackage, but we are not there yet. > > Signed-off-by: Junio C Hamano > --- > git.spec.in | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) Apologies for the late response to this thread. Would it be simpler to define NO_PYTHON when running make? We can always resurrect %python_sitelib when it is needed. Here's what that looks like relative to master. I've tested this on fedora11. On a slightly related note, I'm seeing this as well: error: Installed (but unpackaged) file(s) found: /usr/lib/Git.pm Maybe my setup is wanky? -- >8 -- >From 7fb05607633bc424fc29b645e6f4ee7e48371f94 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 31 Jan 2010 14:52:13 -0800 Subject: [PATCH] RPM packaging: Define NO_PYTHON to avoid Python dependency We don't use the Python bits yet so we shouldn't require python to build. The %define used python to calculate %python_sitelib and thus incurred a build-time python dependency without specifying python in BuildRequires. Signed-off-by: David Aguilar --- git.spec.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec.in b/git.spec.in index 0a03108..ae7edc6 100644 --- a/git.spec.in +++ b/git.spec.in @@ -98,7 +98,6 @@ BuildRequires: perl(Error) Perl interface to Git %define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version} -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %prep %setup -q @@ -106,14 +105,15 @@ Perl interface to Git %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ %{path_settings} \ + NO_PYTHON=NotYet \ all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ %{path_settings} \ + NO_PYTHON=NotYet \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -test ! -d $RPM_BUILD_ROOT%{python_sitelib} || rm -fr $RPM_BUILD_ROOT%{python_sitelib} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Jan 31 2010 David Aguilar +- Define NO_PYTHON until we actually need the Python bits + * Sat Jan 30 2010 Junio C Hamano - We don't ship Python bits until a real foreign scm interface comes. -- 1.6.2.5