15780765 SUNBT7155974 change FMRI of timezone to open source version format s11u2-sru
authorCharly Abraham <Charly.Abraham@oracle.COM>
Mon, 15 Jun 2015 03:17:29 -0700
branchs11u2-sru
changeset 4481 9ee3f8d1c3c6
parent 4475 ae2aef15d437
child 4500 5cbf6ee59546
15780765 SUNBT7155974 change FMRI of timezone to open source version format
components/timezone/Makefile
components/timezone/system-data-timezone-message-files.p5m
components/timezone/system-data-timezone.p5m
--- a/components/timezone/Makefile	Fri Jun 12 09:25:50 2015 -0700
+++ b/components/timezone/Makefile	Mon Jun 15 03:17:29 2015 -0700
@@ -25,6 +25,8 @@
 
 COMPONENT_NAME= 	timezone
 
+COMPONENT_VERSION=    	2015.4 
+
 COMPONENT_BUGDB=	utility/timezone
 
 HUMAN_VERSION=		2015d
--- a/components/timezone/system-data-timezone-message-files.p5m	Fri Jun 12 09:25:50 2015 -0700
+++ b/components/timezone/system-data-timezone-message-files.p5m	Mon Jun 15 03:17:29 2015 -0700
@@ -19,10 +19,10 @@
 # CDDL HEADER END
 #
 
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 
 set name=pkg.fmri \
-    value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/[email protected],$(BUILD_VERSION)
+    value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/[email protected]$(IPS_COMPONENT_VERSION),$(OS_VERSION)-$(OS_VERSION)
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="Translatable content for Timezone Definition"
 set name=com.oracle.info.description value="the translatable content for Timezone Definition"
--- a/components/timezone/system-data-timezone.p5m	Fri Jun 12 09:25:50 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Mon Jun 15 03:17:29 2015 -0700
@@ -22,7 +22,7 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri value=pkg:/system/data/[email protected],$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/system/data/[email protected]$(IPS_COMPONENT_VERSION),$(OS_VERSION)-$(OS_VERSION)
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
 set name=pkg.human-version value=$(HUMAN_VERSION)