From 71825e9b82956e6dbaabb1e164692526c5ec6a78 Mon Sep 17 00:00:00 2001
From: Ian Murray <ian.murray@okfn.org>
Date: Thu, 16 Aug 2012 17:18:53 +0100
Subject: [PATCH] Pull solr version from pip-requirements.txt

---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 41d672ff9ec..4a0ab1365f1 100755
--- a/build.sh
+++ b/build.sh
@@ -81,7 +81,8 @@ buildkit pkg nonpython -p $CKAN_PACKAGE_VERSION \
                        ${CKAN_PATH}/ckan_deb
 
 # Build python-solr
-${CKAN_PATH}/build/buildkit/env/bin/pip install --download-cache ${CKAN_PATH}/build/buildkit/env/cache --no-install --upgrade "solrpy==0.9.4"
+SOLR_VERSION=`egrep '^solrpy' "${CKAN_PATH}/pip-requirements.txt"`
+${CKAN_PATH}/build/buildkit/env/bin/pip install --download-cache ${CKAN_PATH}/build/buildkit/env/cache --no-install --upgrade $SOLR_VERSION
 mv ${CKAN_PATH}/build/buildkit/env/build/solrpy ${CKAN_PATH}/build/buildkit/env/build/solr
 # We need to rename the package here
 sed -e "s,solrpy,solr," -i ${CKAN_PATH}/build/buildkit/env/build/solr/setup.py