Merge pull request cms-sw#2585 from smuzaffar/h5py-fixes-gcc530

H5py fixes gcc530

cython.spec

@@ -21,5 +21,3 @@ sed -ideleteme 's|#!.*/bin/python|#!/usr/bin/env python|' \
   %{i}/${PYTHON_LIB_SITE_PACKAGES}/Cython/Debugger/libpython.py
 
 find %{i} -name '*deleteme' -delete
-
-find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -print0 | xargs -0 rm -f

py2-h5py.spec

@@ -2,8 +2,8 @@
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 %define my_name %(echo %n | cut -f2 -d-)
 Source: https://github.com/%{my_name}/%{my_name}/archive/%{realversion}.tar.gz
-Requires: python py2-numpy hdf5
-BuildRequires: py2-setuptools hdf5
+Requires: python py2-numpy hdf5 py2-six
+BuildRequires: py2-setuptools cython py2-pkgconfig
 
 %prep
 %setup -n %{my_name}-%{realversion}

py2-nose-toolfile.spec

@@ -0,0 +1,24 @@
+### RPM external py2-nose-toolfile 1.0
+Requires: py2-nose
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-nose.xml
+<tool name="py2-nose" version="@TOOL_VERSION@">
+  <info url="https://pypi.python.org/pypi/nose"/>
+  <client>
+    <environment name="PY2_NOSE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$PY2_NOSE/lib"/>
+    <runtime name="PYTHONPATH" value="$PY2_NOSE/lib/python@PYTHONV@/site-packages" type="path"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post
+

py2-nose.spec

@@ -0,0 +1,17 @@
+### RPM external py2-nose 1.3.7
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+%define my_name %(echo %n | cut -f2 -d-)
+Source: https://pypi.python.org/packages/58/a5/0dc93c3ec33f4e281849523a5a913fa1eea9a3068acfa754d44d88107a44/nose-%{realversion}.tar.gz 
+Requires: python
+BuildRequires: py2-setuptools
+
+%prep
+%setup -n %{my_name}-%{realversion}
+
+%build
+python setup.py build
+
+%install
+python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
+perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/nosetests-2.7 %{i}/bin/nosetests
+

py2-pkgconfig-toolfile.spec

@@ -0,0 +1,23 @@
+### RPM external py2-pkgconfig-toolfile 1.0
+Requires: py2-pkgconfig
+%prep
+
+%build
+
+%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-pkgconfig.xml
+<tool name="py2-pkgconfig" version="@TOOL_VERSION@">
+  <client>
+    <environment name="PY2_PKGCONFIG_BASE" default="@TOOL_ROOT@"/>
+  </client>
+  <runtime name="PYTHONPATH" value="$PY2_PKGCONFIG_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
+  <use name="python"/>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post
+

py2-pkgconfig.spec

@@ -0,0 +1,16 @@
+### RPM external py2-pkgconfig 1.1.0
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+
+Source: https://pypi.python.org/packages/87/35/4af9634270c00e3411cf951b7e0ea796c262922357cfc7609a86d31f072b/pkgconfig-1.1.0.tar.gz
+BuildRequires: py2-setuptools
+Requires: python py2-nose
+
+%prep
+%setup -n pkgconfig-%{realversion}
+
+%build
+python setup.py build
+
+%install
+python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
+

py2-setuptools.spec

@@ -1,7 +1,7 @@
-### RPM external py2-setuptools 2.1
+### RPM external py2-setuptools 28.3.0
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 
-Source: https://pypi.python.org/packages/source/s/setuptools/setuptools-%{realversion}.tar.gz
+Source: https://pypi.python.org/packages/6b/dd/a7de8caeeffab76bacf56972b3f090c12e0ae6932245abbce706690a6436/setuptools-28.3.0.tar.gz
 Requires: python
 
 %prep

py2-six.spec

@@ -1,7 +1,7 @@
-### RPM external py2-six 1.9.0
+### RPM external py2-six 1.10.0
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 %define my_name %(echo %n | cut -f2 -d-)
-Source: https://pypi.python.org/packages/source/s/six/%{my_name}-%{realversion}.tar.gz
+Source: https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-%{realversion}.tar.gz
 Requires: python
 BuildRequires: py2-setuptools
 
@@ -13,4 +13,3 @@ python setup.py build
 
 %install
 python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
-find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -print0 | xargs -0 rm -rf