changeset 468:1384245f6865

7046977 git delivers python bits to site-packages
author Rich Burridge <rich.burridge@oracle.com>
date Thu, 17 Nov 2011 10:39:22 -0800
parents b52494e14588
children ef653bdda611
files components/git/git.p5m components/git/patches/python_Makefile.patch
diffstat 2 files changed, 32 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/components/git/git.p5m	Wed Oct 26 19:43:45 2011 -0700
+++ b/components/git/git.p5m	Thu Nov 17 10:39:22 2011 -0800
@@ -41,9 +41,9 @@
 dir path=usr/lib
 dir path=usr/lib/git-core
 dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/site-packages
-dir path=usr/lib/python2.6/site-packages/git_remote_helpers
-dir path=usr/lib/python2.6/site-packages/git_remote_helpers/git
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/git_remote_helpers
+dir path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git
 dir path=usr/perl5
 dir path=usr/perl5/vendor_perl
 dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
@@ -113,15 +113,15 @@
 file path=usr/lib/git-core/git-svn
 file path=usr/lib/git-core/git-web--browse
 file \
-    path=usr/lib/python2.6/site-packages/git_remote_helpers-0.1.0-py2.6.egg-info
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/__init__.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/exporter.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/git.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/importer.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/non_local.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.py
-file path=usr/lib/python2.6/site-packages/git_remote_helpers/util.py
+    path=usr/lib/python2.6/vendor-packages/git_remote_helpers-0.1.0-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/__init__.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/__init__.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/exporter.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/git.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/importer.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/non_local.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/repo.py
+file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/util.py
 file \
     path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Error.pm
 file \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/git/patches/python_Makefile.patch	Thu Nov 17 10:39:22 2011 -0800
@@ -0,0 +1,20 @@
+--- git-1.7.3.2/git_remote_helpers/Makefile.orig	Tue Nov 15 05:25:37 2011
++++ git-1.7.3.2/git_remote_helpers/Makefile	Tue Nov 15 06:35:06 2011
+@@ -23,13 +23,15 @@
+ 
+ PYLIBDIR=$(shell $(PYTHON_PATH) -c \
+ 	 "import sys; \
+-	 print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
++	 print 'lib/python%i.%i/vendor-packages' % sys.version_info[:2]")
+ 
+ all: $(pysetupfile)
+ 	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
+ 
+ install: $(pysetupfile)
+-	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
++	$(PYTHON_PATH) $(pysetupfile) install \
++	--install-lib=$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR) \
++	--prefix $(DESTDIR_SQ)$(prefix)
+ 
+ instlibdir: $(pysetupfile)
+ 	@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"