--- a/components/subversion/Makefile Wed Mar 04 10:42:54 2015 -0800
+++ b/components/subversion/Makefile Mon Mar 16 16:43:06 2015 -0700
@@ -46,6 +46,7 @@
PYMODS = client core delta fs ra repos wc
PLMODS= Fs Core Wc Client Repos Ra Delta
JAVA_ROOT = $(JAVA_HOME)
+PYTHON_VERSION = 2.7
# because we can't seem to get -norunpath to the java bindings build any
# other way.
@@ -130,6 +131,8 @@
CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX)
CONFIGURE_OPTIONS += --with-gssapi=$(CONFIGURE_PREFIX)
+PKG_MACROS += PYVER=$(PYTHON_VERSION)
+
# common targets - we only build 32-bit subversion
build: $(BUILD_32)
--- a/components/subversion/patches/000-Makefile.in.patch Wed Mar 04 10:42:54 2015 -0800
+++ b/components/subversion/patches/000-Makefile.in.patch Mon Mar 16 16:43:06 2015 -0700
@@ -9,8 +9,8 @@
### these possibly need further discussion
-swig_pydir = @libdir@/svn-python/libsvn
-swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
-+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
++swig_pydir = /usr/lib/python2.7/vendor-packages/libsvn
++swig_pydir_extra = /usr/lib/python2.7/vendor-packages/svn
swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
toolsdir = @bindir@/svn-tools
--- a/components/subversion/subversion-python.p5m Wed Mar 04 10:42:54 2015 -0800
+++ b/components/subversion/subversion-python.p5m Mon Mar 16 16:43:06 2015 -0700
@@ -33,38 +33,38 @@
#
dir path=usr
dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/libsvn
-dir path=usr/lib/python2.6/vendor-packages/svn
+dir path=usr/lib/python$(PYVER)
+dir path=usr/lib/python$(PYVER)/vendor-packages
+dir path=usr/lib/python$(PYVER)/vendor-packages/libsvn
+dir path=usr/lib/python$(PYVER)/vendor-packages/svn
dir path=usr/lib/svn
#
-file path=usr/lib/python2.6/vendor-packages/libsvn/_client.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_core.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_delta.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_diff.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_fs.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_ra.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_repos.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_wc.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/client.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/core.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/delta.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/diff.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/fs.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/ra.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/repos.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/wc.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py
-file path=usr/lib/python2.6/vendor-packages/svn/client.py
-file path=usr/lib/python2.6/vendor-packages/svn/core.py
-file path=usr/lib/python2.6/vendor-packages/svn/delta.py
-file path=usr/lib/python2.6/vendor-packages/svn/diff.py
-file path=usr/lib/python2.6/vendor-packages/svn/fs.py
-file path=usr/lib/python2.6/vendor-packages/svn/ra.py
-file path=usr/lib/python2.6/vendor-packages/svn/repos.py
-file path=usr/lib/python2.6/vendor-packages/svn/wc.py
-file path=usr/lib/python2.6/vendor-packages/svn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_client.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_core.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_delta.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_diff.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_fs.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_ra.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_repos.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_wc.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/__init__.py
file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
#
link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0