openblas, Python package cleanup

OpenBLAS-toolfile.spec

@@ -0,0 +1,22 @@
+### RPM external OpenBLAS-toolfile 1.0
+Requires: OpenBLAS
+%prep
+
+%build
+
+%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/OpenBLAS.xml
+<tool name="OpenBLAS" version="@TOOL_VERSION@">
+  <lib name="openblas"/>
+  <client>
+    <environment name="OPENBLAS_BASE" default="@TOOL_ROOT@"/>
+    <environment name="INCLUDE" default="$OPENBLAS_BASE/include"/>
+    <environment name="LIBDIR" default="$OPENBLAS_BASE/lib"/>
+    <environment name="BINDIR" default="$OPENBLAS_BASE/bin"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post

OpenBLAS.spec

@@ -0,0 +1,13 @@
+### RPM external OpenBLAS 0.2.19
+Source: https://github.com/xianyi/OpenBLAS/archive/v%{realversion}.tar.gz
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%build
+
+make %{makeprocesses} FC=gfortran BINARY=64 
+
+%install
+make install PREFIX=%i
+

boost.spec

@@ -84,7 +84,7 @@ for tool in $(echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'); do
   root=$(echo $tool | tr a-z- A-Z_)_ROOT; eval r=\$$root
   if [ X"$r" != X ] && [ -r "$r/etc/profile.d/init.sh" ]; then
     echo "test X\$$root != X || . $r/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
-    echo "test X\$$root != X || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
+    echo "test \$?$root != 0 || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
   fi
 done
 

cherrypy.spec

@@ -1,5 +1,5 @@
 ### RPM external cherrypy 3.1.2
-## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES
+## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 Source: http://download.cherrypy.org/cherrypy/%v/CherryPy-%realversion.tar.gz
 Requires: python
 Patch0: cherrypy-upload

cmssw-tool-conf.spec

@@ -1,4 +1,4 @@
-### RPM cms cmssw-tool-conf 37.0
+### RPM cms cmssw-tool-conf 38.0
 ## NOCOMPILER
 # With cmsBuild, change the above version only when a new
 # tool is added
@@ -87,16 +87,12 @@ Requires: graphviz-toolfile
 Requires: valgrind-toolfile
 Requires: py2-matplotlib-toolfile
 Requires: py2-numpy-toolfile
-Requires: py2-pandas-toolfile
-Requires: py2-scipy-toolfile
 Requires: cmsswdata-toolfile
 Requires: py2-sqlalchemy-toolfile
 Requires: py2-pygithub-toolfile
 Requires: py2-dablooms-toolfile
 Requires: py2-dxr-toolfile
-Requires: py2-pysqlite-toolfile
 Requires: py2-PyYAML-toolfile
-Requires: py2-root_numpy-toolfile
 Requires: py2-h5py-toolfile
 Requires: hdf5-toolfile
 Requires: rivet-toolfile
@@ -152,11 +148,11 @@ Requires: tinyxml-toolfile
 Requires: scons-toolfile
 Requires: md5-toolfile
 Requires: madgraph5amcatnlo-toolfile
-Requires: histogrammar-toolfile
 Requires: py2-pippkgs-toolfile
 Requires: py2-pippkgs_depscipy-toolfile
 Requires: dasgoclient
-#still a work in progress Requires: py2-notebook
+Requires: OpenBLAS
+
 
 # Only for Linux platform.
 %if %islinux

cython.spec

@@ -1,5 +1,5 @@
 ### RPM external cython 0.22
-## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz