# HG changeset patch
# User Norm Jacobs <Norm.Jacobs@Oracle.COM>
# Date 1434562910 25200
# Node ID b5776fb3ca4057489a9d94d86baa32127622d758
# Parent  aad77f4a709b19e2dd257b7aa93626740690cda3
21273362 some 11.3 userland "meta" packages have 5.12 in them

diff -r aad77f4a709b -r b5776fb3ca40 components/meta-packages/developer-opensolaris-userland/Makefile
--- a/components/meta-packages/developer-opensolaris-userland/Makefile	Thu Jun 11 20:52:26 2015 -0700
+++ b/components/meta-packages/developer-opensolaris-userland/Makefile	Wed Jun 17 10:41:50 2015 -0700
@@ -23,6 +23,9 @@
 # Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+# because it hit the 11.3 dev repo this way, we need to keep it at 5.12
+PKG_SOLARIS_VERSION = 5.12
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		developer/opensolaris/userland
diff -r aad77f4a709b -r b5776fb3ca40 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Thu Jun 11 20:52:26 2015 -0700
+++ b/make-rules/shared-macros.mk	Wed Jun 17 10:41:50 2015 -0700
@@ -96,7 +96,7 @@
 OS_VERSION :=		$(shell uname -r)
 SOLARIS_VERSION =	$(OS_VERSION:5.%=2.%)
 # Target OS version
-PKG_SOLARIS_VERSION ?= 5.12
+PKG_SOLARIS_VERSION ?= 0.5.11
 
 
 include $(WS_MAKE_RULES)/ips-buildinfo.mk