Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Normation · Mar 5, 2015 · 82870cf · 82870cf
2 parents 219be13 + d8b50d8
commit 82870cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/ncf-api-virtualenv/SOURCES/Makefile b/ncf-api-virtualenv/SOURCES/Makefile
@@ -19,11 +19,12 @@
 .DEFAULT_GOAL := localdepends
 
 RUDDER_VERSION_TO_PACKAGE = <put Rudder version or version-snapshot here>
+VIRTUALENV_RELEASE = 12.0.7
 
 TMP_DIR := $(shell mktemp -dq /tmp/rudder.XXXXXX)
 WGET := $(if $(PROXY), http_proxy=$(PROXY) ftp_proxy=$(PROXY)) /usr/bin/wget -q
 
-localdepends: ./rudder-sources
+localdepends: ./rudder-sources ./virtualenv/virtualenv.py
 	# N/A
 
 ./rudder-sources.tar.bz2:
@@ -33,12 +34,21 @@ localdepends: ./rudder-sources
 	tar -xjf rudder-sources.tar.bz2
 	mv rudder-sources-*/ rudder-sources/
 
+./virtualenv.tgz: /usr/bin/wget
+	# Original URL: https://pypi.python.org/packages/source/v/virtualenv/virtualenv-12.0.7.tar.gz
+	$(WGET) -O virtualenv.tgz http://www.normation.com/tarball/virtualenv/virtualenv-$(VIRTUALENV_RELEASE).tar.gz
+
+./virtualenv/virtualenv.py: ./virtualenv.tgz
+	tar -xzf ./virtualenv.tgz
+	mv ./virtualenv-*/ virtualenv/
+
 localclean:
 	rm -rf rudder-sources
-	rm -f virtualenv.pyc
+	rm -rf virtualenv/
 	rm -rf ncf-api-virtualenv
 
 veryclean:
+	rm -f virtualenv.tgz
 	rm -f rudder-sources.tar.bz2
 
 clean: localclean veryclean

diff --git a/ncf-api-virtualenv/SPECS/ncf-api-virtualenv.spec b/ncf-api-virtualenv/SPECS/ncf-api-virtualenv.spec
@@ -113,7 +113,7 @@ of the ncf API easier.
 cd %{_sourcedir}
 
 # Build Virtualenv
-python virtualenv.py %{real_name}
+python virtualenv/virtualenv.py %{real_name}
 
 ## SLES
 %if 0%{?sles_version}

diff --git a/ncf-api-virtualenv/debian/rules b/ncf-api-virtualenv/debian/rules
@@ -20,8 +20,8 @@ build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	# Build Virtualenv
-	cd SOURCES && python virtualenv.py ncf-api-virtualenv
+	# Build Virtualenv
+	cd SOURCES && python virtualenv/virtualenv.py ncf-api-virtualenv
 
 	# Get all requirements via pip
 	cd SOURCES && ncf-api-virtualenv/bin/pip install -r rudder-sources/ncf/api/requirements.txt