# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1491856698 25200
# Node ID 00779abaaf040267f5c878ba1709883efeebb112
# Parent  dd21a41cec9e11dfd34a275468af41d2b5f4a817
21453631 Python subversion library package should conform to naming convention

diff -r dd21a41cec9e -r 00779abaaf04 components/subversion/Makefile
--- a/components/subversion/Makefile	Fri Apr 07 18:00:22 2017 -0700
+++ b/components/subversion/Makefile	Mon Apr 10 13:38:18 2017 -0700
@@ -39,6 +39,8 @@
 
 TPNO=			33892
 
+PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+
 include $(WS_MAKE_RULES)/common.mk
 
 PATCH_LEVEL := 0
@@ -199,6 +201,7 @@
 
 PKG_MACROS += PERL_ARCH_22="$(PERL_ARCH_22)"
 PKG_MACROS += PYVER=$(PYTHON_VERSION)
+PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSION) | tr -d .)
 
 # Swig overwrites the 32-bit directory with 64-bit objects.
 # So we work around that.
diff -r dd21a41cec9e -r 00779abaaf04 components/subversion/subversion-python-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/subversion-python-PYVER.p5m	Mon Apr 10 13:38:18 2017 -0700
@@ -0,0 +1,113 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/python/subversion-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for the Subversion SCM"
+#
+# This package name has known conflicts with other packages in the WOS
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=com.oracle.info.description \
+    value="Python bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/563
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_client.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_core.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_delta.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_diff.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_fs.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_ra.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_repos.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_wc.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/wc.py
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/__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/svn/__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
+#
+link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \
+    target=libsvn_swig_py-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0 \
+    target=libsvn_swig_py-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0.0.0
+link path=usr/lib/svn/libsvn_swig_py-1.so target=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
+#
+file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
+#
+license subversion.license license="Apache v2.0"
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/subversion@1.7.5,5.12-5.12.0.0.0.41.0
+
+# force a dependency on the Python $(PYVER) runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+# force a dependency on the subversion package
+depend type=require \
+    fmri=library/python/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r dd21a41cec9e -r 00779abaaf04 components/subversion/subversion-python.p5m
--- a/components/subversion/subversion-python.p5m	Fri Apr 07 18:00:22 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-set name=pkg.fmri \
-    value=pkg:/library/python/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for the Subversion SCM"
-#
-# This package name has known conflicts with other packages in the WOS
-set name=pkg.linted.pkglint.manifest004 value=true
-set name=com.oracle.info.description \
-    value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2006/563
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_client.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_core.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_delta.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_diff.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_fs.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_ra.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_repos.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_wc.so
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/core.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/delta.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/diff.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/fs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/ra.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/repos.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/wc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/core.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/delta.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/diff.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/fs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/ra.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/repos.py
-file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/wc.py
-#
-file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/__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/svn/__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
-#
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \
-    target=libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0 \
-    target=libsvn_swig_py-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/libsvn_swig_py-1.so target=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
-#
-file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
-#
-license subversion.license license="Apache v2.0"
-
-# force the rename with an optional dependency on the old name
-depend type=optional fmri=library/python-2/subversion@1.7.5,5.12-5.12.0.0.0.41.0