Merge "Double Commit: Correcting the dependency of nodejs version in …

…contrail-web-core spec" into R1.10
Juniper · Aug 25, 2014 · 7752e4f · 7752e4f
2 parents 1f9f1e9 + c36cc82
commit 7752e4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/debian/contrail-web-core/debian/control b/common/debian/contrail-web-core/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8)
 Package: contrail-web-core
 Architecture: amd64
 Maintainer: swamy <swamy@juniper.net>
-Depends: redis-server (>= 2.6.13-1), nodejs, python-contrail
+Depends: redis-server (>= 2.6.13-1), nodejs (=0.8.15-1contrail1), python-contrail
 Replaces: contrail-webui
 Conflicts: contrail-webui
 Section: contrail-web-core

diff --git a/common/rpm/contrail-web-core.spec b/common/rpm/contrail-web-core.spec
@@ -35,9 +35,9 @@ Vendor:             Juniper Networks Inc
 
 Requires:	redis
 %if %{_skuTag} == "grizzly"
-Requires:	contrail-nodejs >= %{_verstr}-%{_relstr}
+Requires:	contrail-nodejs = 0.8.15-1%{?dist}
 %else
-Requires:	nodejs
+Requires:	nodejs = 0.8.15-1%{?dist}
 %endif
 Requires:	supervisor
 Requires: 	python-contrail >= %{_verstr}-%{_relstr}