15780765 SUNBT7155974 change FMRI of timezone to open source version format s11-update
authorCharly Abraham <Charly.Abraham@oracle.COM>
Thu, 28 May 2015 03:17:48 -0700
branchs11-update
changeset 4369 9935f32cf81f
parent 4368 0e73d8e413e3
child 4376 f3801994dee3
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	Wed May 27 18:54:12 2015 -0700
+++ b/components/timezone/Makefile	Thu May 28 03:17:48 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	Wed May 27 18:54:12 2015 -0700
+++ b/components/timezone/system-data-timezone-message-files.p5m	Thu May 28 03:17:48 2015 -0700
@@ -22,7 +22,7 @@
 # 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.summary value="Translatable content for Timezone Definition"
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.linted.opensolaris.manifest001.1 value=true
--- a/components/timezone/system-data-timezone.p5m	Wed May 27 18:54:12 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Thu May 28 03:17:48 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)