Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21960273 parameterize the old desktop build value when simplejson migrated
authorJohn Beck <John.Beck@Oracle.COM>
Fri, 02 Oct 2015 10:36:56 -0700
changeset 4972 882943f5c0d0
parent 4971 391f6274d2b4
child 4973 be26c0c14fa7
21960273 parameterize the old desktop build value when simplejson migrated
components/python/simplejson/Makefile file | annotate | diff | comparison | revisions
components/python/simplejson/simplejson-GENFRAG.p5m file | annotate | diff | comparison | revisions
components/python/simplejson/simplejson-PYVER.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/simplejson/Makefile	Fri Oct 02 10:09:45 2015 -0700
+++ b/components/python/simplejson/Makefile	Fri Oct 02 10:36:56 2015 -0700
@@ -43,6 +43,14 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
+ifeq ($(OS_VERSION),5.11)
+OLD_DESKTOP_BUILD=	0.5.11,5.11-0.175.2.0.0.20.0
+else
+OLD_DESKTOP_BUILD=	5.12-5.12.0.0.0.14.0
+endif
+
+PKG_MACROS +=		OLD_DESKTOP_BUILD=$(OLD_DESKTOP_BUILD)
+
 COMPONENT_TEST_DIR= $(COMPONENT_SRC)/$(COMPONENT_NAME)/tests
 COMPONENT_TEST_CMD= /usr/bin/py.test-$(PYTHON_VERSION)
 COMPONENT_TEST_ARGS= -v
--- a/components/python/simplejson/simplejson-GENFRAG.p5m	Fri Oct 02 10:09:45 2015 -0700
+++ b/components/python/simplejson/simplejson-GENFRAG.p5m	Fri Oct 02 10:36:56 2015 -0700
@@ -20,14 +20,14 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # simplejson was previously in the 'desktop' consolidation. This optional
 # dependency is here to facilitate the safe transfer of the package
 # to the 'userland' consolidation.
 depend type=optional \
-    fmri=consolidation/desktop/[email protected]
+    fmri=consolidation/desktop/desktop-incorporation@$(OLD_DESKTOP_BUILD)
 
 # force the rename with an optional dependency on the old name
 depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/python/simplejson/simplejson-PYVER.p5m	Fri Oct 02 10:09:45 2015 -0700
+++ b/components/python/simplejson/simplejson-PYVER.p5m	Fri Oct 02 10:36:56 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -59,7 +59,7 @@
 # dependency is here to facilitate the safe transfer of the package
 # to the 'userland' consolidation.
 depend type=optional \
-    fmri=consolidation/desktop/[email protected]
+    fmri=consolidation/desktop/desktop-incorporation@$(OLD_DESKTOP_BUILD)
 
 # force the rename with an optional dependency on the old name
 depend type=optional \
upstream/oracle/userland-gate