xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

roll back to numpy 1.5.0 due to httpd-pypies errors

Browse source 
Former-commit-id: 85b42d3bbd
This commit is contained in:
mjames-upc 2015-08-17 12:49:21 -06:00
parent 1c52b407a2
commit f11c4297a6
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpms/build/x86_64/build.sh
View file

@ -128,14 +128,14 @@ if [ "${1}" = "-python" ]; then
#buildRPM "awips2-python-cython"
#buildRPM "awips2-python-six"
#buildRPM "awips2-python-dateutil"
#buildRPM "awips2-python-numpy"
buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pil"
#buildRPM "awips2-python-pmw"
#buildRPM "awips2-python-pupynere"
#buildRPM "awips2-python-qpid"
#buildRPM "awips2-python-scientific"
#buildRPM "awips2-python-scipy"
buildRPM "awips2-python-pyparsing"
#buildRPM "awips2-python-pyparsing"
#buildRPM "awips2-python-pint"
#buildRPM "awips2-python-metpy"
#buildRPM "awips2-python-tables"

12
rpms/python.site-packages/Installer.numpy/component.spec
View file

@ -8,7 +8,7 @@
#
Name: awips2-python-numpy
Summary: AWIPS II Python numpy Distribution
Version: 1.9.2
Version: 1.5.0
Release: 1
Group: AWIPSII
BuildRoot: %{_build_root}
@ -47,7 +47,7 @@ mkdir -p %{_python_build_loc}
%build
NUMPY_SRC_DIR="%{_python_pkgs_dir}/numpy"
NUMPY_TAR="numpy-1.9.2.tar.gz"
NUMPY_TAR="numpy-1.5.0.tar.gz"
NUMPY_PATCH="numpy.patch1"
cp -v ${NUMPY_SRC_DIR}/${NUMPY_TAR} \
%{_python_build_loc}
@ -70,8 +70,8 @@ if [ ${RC} -ne 0 ]; then
exit 1
fi
rm -fv ${NUMPY_TAR}
if [ ! -d numpy-1.9.2 ]; then
file numpy-1.9.2
if [ ! -d numpy-1.5.0 ]; then
file numpy-1.5.0
exit 1
fi
source /etc/profile.d/awips2Python.sh
@ -79,7 +79,7 @@ RC=$?
if [ ${RC} -ne 0 ]; then
exit 1
fi
cd numpy-1.9.2
cd numpy-1.5.0
# Apply the patch
patch -p1 -i ../${NUMPY_PATCH}
RC=$?
@ -102,7 +102,7 @@ popd > /dev/null
NUMPY_SRC_DIR="%{_python_pkgs_dir}/numpy"
pushd . > /dev/null
cd %{_python_build_loc}/numpy-1.9.2
cd %{_python_build_loc}/numpy-1.5.0
export LD_LIBRARY_PATH=/awips2/python/lib
/awips2/python/bin/python setup.py install \
--root=%{_build_root} \