Fix dependencies so the generated packages actually install oi-extras
authorAndrzej Szeszo <aszeszo@gmail.com>
Fri, 22 Apr 2011 04:18:11 +0100
branchoi-extras
changeset 194 9b866524adff
parent 193 0780a710c42e
child 195 f6b7d5a2199e
Fix dependencies so the generated packages actually install
sic_team/java-jss/java-jss.p5m
sic_team/mozilla-nspr/library-nspr.p5m
sic_team/mozilla-nss/system-mozilla-nss.p5m
--- a/sic_team/java-jss/java-jss.p5m	Fri Apr 22 04:17:38 2011 +0100
+++ b/sic_team/java-jss/java-jss.p5m	Fri Apr 22 04:18:11 2011 +0100
@@ -25,9 +25,9 @@
     pkg=SUNWjss variant.arch=$(MACH) vendor="OpenIndiana Project" \
     version=$(IPS_COMPONENT_VERSION),REV=2011.04.21.00.52
 
-depend fmri=library/nspr@$(BUILD_VERSION) type=require
-depend fmri=system/library@$(BUILD_VERSION) type=require
-depend fmri=system/library/mozilla-nss@$(BUILD_VERSION) type=require
+depend fmri=library/nspr@0.$(BUILD_VERSION) type=require
+depend fmri=system/library@0.$(BUILD_VERSION) type=require
+depend fmri=system/library/mozilla-nss@0.$(BUILD_VERSION) type=require
 depend fmri=consolidation/sic_team/sic_team-incorporation type=require
 
 license java-jss.license license="MPL 1.1/GPL 2.0/LGPL 2.1"
--- a/sic_team/mozilla-nspr/library-nspr.p5m	Fri Apr 22 04:17:38 2011 +0100
+++ b/sic_team/mozilla-nspr/library-nspr.p5m	Fri Apr 22 04:18:11 2011 +0100
@@ -22,7 +22,7 @@
 license nspr.license license="MPL 1.1/GPL 2.0/LGPL 2.1"
 set name=variant.arch value=$(MACH)
 depend fmri=consolidation/sic_team/sic_team-incorporation type=require
-depend fmri=system/library@$(BUILD_VERSION) type=require
+depend fmri=system/library@0.$(BUILD_VERSION) type=require
 legacy arch=$(MACH) category=system desc="Netscape Portable Runtime Interface" \
     hotline="Please contact your local service provider" name="Netscape Portable Runtime" \
     pkg=SUNWpr variant.arch=$(MACH) vendor="Project OpenIndiana" \
--- a/sic_team/mozilla-nss/system-mozilla-nss.p5m	Fri Apr 22 04:17:38 2011 +0100
+++ b/sic_team/mozilla-nss/system-mozilla-nss.p5m	Fri Apr 22 04:18:11 2011 +0100
@@ -21,10 +21,10 @@
 set name=pkg.description value="Network Security Services Utilities Programs"
 license nss.license license="MPL 1.1/GPL 2.0/LGPL 2.1"
 set name=variant.arch value=$(MACH)
-depend fmri=system/library/mozilla-nss@$(BUILD_VERSION) type=require
+depend fmri=system/library/mozilla-nss@0.$(BUILD_VERSION) type=require
 depend fmri=consolidation/sic_team/sic_team-incorporation type=require
-depend fmri=system/library@$(BUILD_VERSION) type=require
-depend fmri=library/nspr@$(BUILD_VERSION) type=require
+depend fmri=system/library@0.$(BUILD_VERSION) type=require
+depend fmri=library/nspr@0.$(BUILD_VERSION) type=require
 legacy arch=$(MACH) category=system desc="Network Security Services Utilities Programs" \
     hotline="Please contact your local service provider" name="Network Security Services Utilities" \
     pkg=SUNWtlsu variant.arch=$(MACH) vendor="OpenIndiana Project" \