From f9a829dfca2dbc1d3f8bc233c5fd01e2b4594b45 Mon Sep 17 00:00:00 2001
From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 13 Jul 2016 15:18:50 -0700
Subject: [PATCH 1/2] googletest: avoid installing any pieces of it

This makes rpmbuild happy.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---
 src/googletest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/googletest b/src/googletest
index 7f8609b0c2670..fdb850479284e 160000
--- a/src/googletest
+++ b/src/googletest
@@ -1 +1 @@
-Subproject commit 7f8609b0c2670e82fc0372b1610b33efd6be2070
+Subproject commit fdb850479284e2aae047b87df6beae84236d0135

From 2699b6d89b8c1c193fd86b5233d1ea86458753a0 Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oleh@pryp.in>
Date: Thu, 14 Jul 2016 01:06:51 +0300
Subject: [PATCH 2/2] install-deps: Get the latest virtualenv in a temporary
 folder to work around a bug in old virtualenv

Signed-off-by: Oleh Prypin <oleh@pryp.in>
---
 install-deps.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/install-deps.sh b/install-deps.sh
index 246aca2ae548e..5bdc8c4ff18d5 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -146,7 +146,14 @@ function activate_virtualenv() {
     local env_dir=$top_srcdir/install-deps-$interpreter
 
     if ! test -d $env_dir ; then
-        virtualenv --python $interpreter $env_dir
+        # Make a temporary virtualenv to get a fresh version of virtualenv
+        # because CentOS 7 has a buggy old version (v1.10.1)
+        # https://github.com/pypa/virtualenv/issues/463
+        virtualenv ${env_dir}_tmp
+        ${env_dir}_tmp/bin/pip install --upgrade virtualenv
+        ${env_dir}_tmp/bin/virtualenv --python $interpreter $env_dir
+        rm -rf ${env_dir}_tmp
+
         . $env_dir/bin/activate
         if ! populate_wheelhouse install ; then
             rm -rf $env_dir