diff --git a/cherrypy.spec b/cherrypy.spec deleted file mode 100644 index a1abfc608c9..00000000000 --- a/cherrypy.spec +++ /dev/null @@ -1,22 +0,0 @@ -### RPM external cherrypy 3.1.2 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} -Source: http://download.cherrypy.org/cherrypy/%v/CherryPy-%realversion.tar.gz -Requires: python -Patch0: cherrypy-upload -Patch1: cherrypy-trailers -Patch2: cherrypy-report-all-bytes - -%prep -%setup -n CherryPy-%realversion -perl -p -i -e 's/import profile/import cProfile as profile/' cherrypy/lib/profiler.py -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -%build -python setup.py build - -%install -python setup.py install --prefix=%i -find %i -name '*.egg-info' -exec rm {} \; -for f in %i/bin/cherryd; do perl -p -i -e 's{.*}{#!/usr/bin/env python} if $. == 1 && m{#!.*/bin/python}' $f; done diff --git a/cmssw-toolfile.spec b/cmssw-toolfile.spec index ac6ab06acb0..5dc1bdfa951 100644 --- a/cmssw-toolfile.spec +++ b/cmssw-toolfile.spec @@ -18,8 +18,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cmssw.xml - - + + diff --git a/coral-toolfile.spec b/coral-toolfile.spec index ceeb40e2f45..d3101ab96cf 100644 --- a/coral-toolfile.spec +++ b/coral-toolfile.spec @@ -14,8 +14,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/coral.xml - - + + diff --git a/cvs2git-toolfile.spec b/cvs2git-toolfile.spec index be257856d2f..28c5da7b2f0 100644 --- a/cvs2git-toolfile.spec +++ b/cvs2git-toolfile.spec @@ -9,7 +9,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cvs2git.xml - + EOF_TOOLFILE diff --git a/cython-toolfile.spec b/cython-toolfile.spec index 74427b21a9c..56790330059 100644 --- a/cython-toolfile.spec +++ b/cython-toolfile.spec @@ -12,7 +12,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cython.xml - + EOF_TOOLFILE diff --git a/das_client-toolfile.spec b/das_client-toolfile.spec index d3142b79922..70739c41846 100644 --- a/das_client-toolfile.spec +++ b/das_client-toolfile.spec @@ -11,7 +11,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/das_client.xml - + EOF_TOOLFILE diff --git a/frontier_client-toolfile.spec b/frontier_client-toolfile.spec index 9fb913e47a9..6cd1a0cf542 100644 --- a/frontier_client-toolfile.spec +++ b/frontier_client-toolfile.spec @@ -21,7 +21,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/frontier_client.xml - + EOF_TOOLFILE diff --git a/gosam-toolfile.spec b/gosam-toolfile.spec index e2ac6d524ae..7a16105f5d9 100644 --- a/gosam-toolfile.spec +++ b/gosam-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gosam.xml - + EOF_TOOLFILE diff --git a/lhapdf-toolfile.spec b/lhapdf-toolfile.spec index 1d35723759a..ca34b833e6e 100644 --- a/lhapdf-toolfile.spec +++ b/lhapdf-toolfile.spec @@ -17,7 +17,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/lhapdf.xml - + diff --git a/llvm-gcc-toolfile.spec b/llvm-gcc-toolfile.spec index c56a86b351a..7e78e066b9e 100644 --- a/llvm-gcc-toolfile.spec +++ b/llvm-gcc-toolfile.spec @@ -141,7 +141,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/pyclang.xml - + EOF_TOOLFILE diff --git a/llvm.spec b/llvm.spec index 3f7c36a10b4..8c6332e4e1a 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,6 +1,6 @@ ### RPM external llvm 5.0.0 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64 -## INITENV +PATH PYTHONPATH %{i}/lib64/python$(echo $PYTHON_VERSION | cut -d. -f 1,2)/site-packages +## INITENV +PATH PYTHON27PATH %{i}/lib64/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages BuildRequires: python cmake ninja Requires: gcc zlib diff --git a/mod_python.spec b/mod_python.spec deleted file mode 100644 index 3e4d0ce5b75..00000000000 --- a/mod_python.spec +++ /dev/null @@ -1,33 +0,0 @@ -### RPM external mod_python 3.2.8 - -%define pythonv %(echo $PYTHON_VERSION | cut -d. -f 1,2) -## INITENV +PATH PYTHONPATH %{i}/lib/python%{pythonv} -## INITENV CMD ln -sf $MOD_PYTHON_ROOT/lib/mod_python.so $APACHE_ROOT/modules - -Source: http://apache.osuosl.org/httpd/modpython/%{n}-%{v}.tgz -Requires: python apache - - -%build -./configure --prefix=%{i} \ - --with-python=$PYTHON_ROOT/bin/python \ - --with-apxs=$APACHE_ROOT/bin/apxs - -make - -cd dist -python setup.py build - -%install - -mkdir -p %i/lib -cp src/mod_python.so %i/lib - -cd dist -python setup.py install --prefix=%i - -mv %{i}/lib/python%{pythonv}/site-packages/mod_python \ - %{i}/lib/python%{pythonv} - -rm -rf %{i}/lib/python%{pythonv}/site-packages - diff --git a/photospline-toolfile.spec b/photospline-toolfile.spec index bfa8f478d43..50a5b4aede2 100644 --- a/photospline-toolfile.spec +++ b/photospline-toolfile.spec @@ -15,7 +15,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/photospline.xml - + diff --git a/professor-toolfile.spec b/professor-toolfile.spec index 7cc74c67458..f302dbf4f09 100644 --- a/professor-toolfile.spec +++ b/professor-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/professor.xml - + EOF_TOOLFILE diff --git a/professor.spec b/professor.spec index fa5861223f0..518e8098a0f 100644 --- a/professor.spec +++ b/professor.spec @@ -1,5 +1,5 @@ ### RPM external professor 1.4.0 -## INITENV +PATH PYTHONPATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages +## INITENV +PATH PYTHON27PATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages Source: http://www.hepforge.org/archive/professor/professor-%{realversion}.tar.gz Requires: py2-numpy py2-scipy pyminuit2 py2-matplotlib diff --git a/professor2-toolfile.spec b/professor2-toolfile.spec index 775c30a3b56..3889d18eb0c 100644 --- a/professor2-toolfile.spec +++ b/professor2-toolfile.spec @@ -19,7 +19,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/professor2.xml - + EOF_TOOLFILE diff --git a/professor2.spec b/professor2.spec index 92570c5222e..7ddc160ffce 100644 --- a/professor2.spec +++ b/professor2.spec @@ -1,5 +1,5 @@ ### RPM external professor2 2.2.1 -## INITENV +PATH PYTHONPATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages +## INITENV +PATH PYTHON27PATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages Source: http://www.hepforge.org/archive/professor/Professor-%{realversion}.tar.gz Requires: py2-numpy py2-pippkgs py2-matplotlib root yoda eigen diff --git a/py2-Jinja.spec b/py2-Jinja.spec index aae66e3062d..50c650cb4cd 100644 --- a/py2-Jinja.spec +++ b/py2-Jinja.spec @@ -1,5 +1,5 @@ ### RPM external py2-Jinja 1.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Jinja diff --git a/py2-Jinja2.spec b/py2-Jinja2.spec index 481ff2c6f79..c064ed33ef5 100644 --- a/py2-Jinja2.spec +++ b/py2-Jinja2.spec @@ -1,5 +1,5 @@ ### RPM external py2-Jinja2 2.10 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Jinja2 diff --git a/py2-Keras.spec b/py2-Keras.spec index f5fa56c3b93..4a2373e26af 100644 --- a/py2-Keras.spec +++ b/py2-Keras.spec @@ -1,5 +1,5 @@ ### RPM external py2-Keras 2.1.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Keras Requires: py2-PyYAML py2-six py2-scipy py2-Theano py2-numpy diff --git a/py2-MarkupSafe.spec b/py2-MarkupSafe.spec index 9f6ba0e6ae0..e412b9ced16 100644 --- a/py2-MarkupSafe.spec +++ b/py2-MarkupSafe.spec @@ -1,5 +1,5 @@ ### RPM external py2-MarkupSafe 1.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name MarkupSafe diff --git a/py2-PyYAML-toolfile.spec b/py2-PyYAML-toolfile.spec index b4de84d0d36..7b36d96722c 100644 --- a/py2-PyYAML-toolfile.spec +++ b/py2-PyYAML-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-PyYAML.xml - + EOF_TOOLFILE diff --git a/py2-PyYAML.spec b/py2-PyYAML.spec index 935cd02eb57..8f0928d746d 100644 --- a/py2-PyYAML.spec +++ b/py2-PyYAML.spec @@ -1,5 +1,5 @@ ### RPM external py2-PyYAML 3.11 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define my_name %(echo %n | cut -f2 -d-) Source: http://pyyaml.org/download/pyyaml/%{my_name}-%{realversion}.tar.gz diff --git a/py2-Pygments.spec b/py2-Pygments.spec index 1e23aa88c29..fdb36f00dc9 100644 --- a/py2-Pygments.spec +++ b/py2-Pygments.spec @@ -1,5 +1,5 @@ ### RPM external py2-Pygments 2.2.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Pygments diff --git a/py2-Theano.spec b/py2-Theano.spec index 2c573ad2fd2..0dfbe2a9a57 100644 --- a/py2-Theano.spec +++ b/py2-Theano.spec @@ -1,5 +1,5 @@ ### RPM external py2-Theano 1.0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Theano diff --git a/py2-appdirs.spec b/py2-appdirs.spec index be3a6c4d26e..ea58f9db439 100644 --- a/py2-appdirs.spec +++ b/py2-appdirs.spec @@ -1,5 +1,5 @@ ### RPM external py2-appdirs 1.4.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name appdirs diff --git a/py2-argparse.spec b/py2-argparse.spec index f3fdb80d828..5473deca17a 100644 --- a/py2-argparse.spec +++ b/py2-argparse.spec @@ -1,5 +1,5 @@ ### RPM external py2-argparse 1.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name argparse diff --git a/py2-avro.spec b/py2-avro.spec index d5c5dc338fc..3118f2bad76 100644 --- a/py2-avro.spec +++ b/py2-avro.spec @@ -1,5 +1,5 @@ ### RPM external py2-avro 1.8.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name avro diff --git a/py2-backports_abc.spec b/py2-backports_abc.spec index 0296ac123ea..73e73bea9ad 100644 --- a/py2-backports_abc.spec +++ b/py2-backports_abc.spec @@ -1,5 +1,5 @@ ### RPM external py2-backports_abc 0.5 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name backports_abc diff --git a/py2-backportsssl_match_hostname.spec b/py2-backportsssl_match_hostname.spec index 04ce87f34f9..cd59e2ceac8 100644 --- a/py2-backportsssl_match_hostname.spec +++ b/py2-backportsssl_match_hostname.spec @@ -1,5 +1,5 @@ ### RPM external py2-backportsssl_match_hostname 3.5.0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name backports.ssl_match_hostname diff --git a/py2-bleach.spec b/py2-bleach.spec index 69409ff293f..dc034ed0115 100644 --- a/py2-bleach.spec +++ b/py2-bleach.spec @@ -1,5 +1,5 @@ ### RPM external py2-bleach 2.1.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name bleach diff --git a/py2-bottleneck.spec b/py2-bottleneck.spec index f399e2e4a66..94f5f18ecbb 100644 --- a/py2-bottleneck.spec +++ b/py2-bottleneck.spec @@ -1,5 +1,5 @@ ### RPM external py2-bottleneck 1.2.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name bottleneck Requires: py2-numpy diff --git a/py2-certifi.spec b/py2-certifi.spec index ef499678e63..8c361a3ca93 100644 --- a/py2-certifi.spec +++ b/py2-certifi.spec @@ -1,5 +1,5 @@ ### RPM external py2-certifi 2018.1.18 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name certifi diff --git a/py2-chardet.spec b/py2-chardet.spec index d4cdb65cc40..52cc45785fa 100644 --- a/py2-chardet.spec +++ b/py2-chardet.spec @@ -1,5 +1,5 @@ ### RPM external py2-chardet 3.0.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipBuildOptions --upgrade %define pip_name chardet diff --git a/py2-cjson.spec b/py2-cjson.spec index 8216950c3ab..dc8796b002c 100644 --- a/py2-cjson.spec +++ b/py2-cjson.spec @@ -1,5 +1,5 @@ ### RPM external py2-cjson 1.2.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name python-cjson diff --git a/py2-click.spec b/py2-click.spec index 4380935770f..a8b25d9e94d 100644 --- a/py2-click.spec +++ b/py2-click.spec @@ -1,5 +1,5 @@ ### RPM external py2-click 6.7 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name click diff --git a/py2-climate.spec b/py2-climate.spec index a4ec6371865..a36a62d3d4e 100644 --- a/py2-climate.spec +++ b/py2-climate.spec @@ -1,5 +1,5 @@ ### RPM external py2-climate 0.4.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name climate diff --git a/py2-configparser.spec b/py2-configparser.spec index 0c31f43d251..6029ecf5c51 100644 --- a/py2-configparser.spec +++ b/py2-configparser.spec @@ -1,4 +1,4 @@ ### RPM external py2-configparser 3.5.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-cx-oracle-toolfile.spec b/py2-cx-oracle-toolfile.spec index a63061b7924..4987305d01f 100644 --- a/py2-cx-oracle-toolfile.spec +++ b/py2-cx-oracle-toolfile.spec @@ -12,7 +12,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-cx-oracle.xml - + diff --git a/py2-cx-oracle.spec b/py2-cx-oracle.spec index f9c3bf839b0..4aa19c22dc9 100644 --- a/py2-cx-oracle.spec +++ b/py2-cx-oracle.spec @@ -1,5 +1,5 @@ ### RPM external py2-cx-oracle 5.2.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define downloadn cx_Oracle Source: https://bitbucket.org/anthony_tuininga/cx_oracle/get/%{realversion}.tar.gz diff --git a/py2-cycler.spec b/py2-cycler.spec index 2078a921bbb..6a35db01ede 100644 --- a/py2-cycler.spec +++ b/py2-cycler.spec @@ -1,5 +1,5 @@ ### RPM external py2-cycler 0.10.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name cycler diff --git a/py2-cython.spec b/py2-cython.spec index 302a8e7f56a..4ea3de91fa9 100644 --- a/py2-cython.spec +++ b/py2-cython.spec @@ -1,5 +1,5 @@ ### RPM external py2-cython 0.27.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name cython diff --git a/py2-dablooms-toolfile.spec b/py2-dablooms-toolfile.spec index 2808676f5e6..fc34d5446ef 100644 --- a/py2-dablooms-toolfile.spec +++ b/py2-dablooms-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-dablooms.xml - + EOF_TOOLFILE diff --git a/py2-dablooms.spec b/py2-dablooms.spec index 276ca45f3b5..b37f2ff4be9 100644 --- a/py2-dablooms.spec +++ b/py2-dablooms.spec @@ -1,5 +1,5 @@ ### RPM external py2-dablooms 0.9.1 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES} Source: https://github.com/bitly/dablooms/archive/v%realversion.tar.gz Requires: python diff --git a/py2-decorator.spec b/py2-decorator.spec index 6a0e9bec029..6434ecb9017 100644 --- a/py2-decorator.spec +++ b/py2-decorator.spec @@ -1,5 +1,5 @@ ### RPM external py2-decorator 4.2.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name decorator diff --git a/py2-deepdish.spec b/py2-deepdish.spec index 284086fc6fa..77a21c2f674 100644 --- a/py2-deepdish.spec +++ b/py2-deepdish.spec @@ -1,5 +1,5 @@ ### RPM external py2-deepdish 0.3.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name deepdish diff --git a/py2-docopt.spec b/py2-docopt.spec index d15de966d0c..6ec5f895ea7 100644 --- a/py2-docopt.spec +++ b/py2-docopt.spec @@ -1,5 +1,5 @@ ### RPM external py2-docopt 0.6.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name docopt diff --git a/py2-downhill.spec b/py2-downhill.spec index 8729315d230..c9b7b3d5112 100644 --- a/py2-downhill.spec +++ b/py2-downhill.spec @@ -1,5 +1,5 @@ ### RPM external py2-downhill 0.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name downhill Requires: py2-Theano py2-click diff --git a/py2-dxr-toolfile.spec b/py2-dxr-toolfile.spec index 98ea4f8bf78..40f954baaa8 100644 --- a/py2-dxr-toolfile.spec +++ b/py2-dxr-toolfile.spec @@ -14,7 +14,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-dxr.xml - + diff --git a/py2-dxr.spec b/py2-dxr.spec index e7d93bdff5d..ecacbd6ee70 100644 --- a/py2-dxr.spec +++ b/py2-dxr.spec @@ -1,5 +1,5 @@ ### RPM external py2-dxr 1.0 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES} Requires: python zlib py2-setuptools py2-pysqlite llvm sqlite py2-pippkgs %define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) %define dxrCommit 6ea764102a diff --git a/py2-entrypoints.spec b/py2-entrypoints.spec index e4f14e09e95..08e2c97b596 100644 --- a/py2-entrypoints.spec +++ b/py2-entrypoints.spec @@ -1,5 +1,5 @@ ### RPM external py2-entrypoints 0.2.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipDownloadOptions --no-deps%%20--no-binary%%3D:none: %define pip_name entrypoints diff --git a/py2-enum34.spec b/py2-enum34.spec index 162f8bd1cae..32ee35f7cee 100644 --- a/py2-enum34.spec +++ b/py2-enum34.spec @@ -1,4 +1,4 @@ ### RPM external py2-enum34 1.1.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-fs.spec b/py2-fs.spec index 23d44855aa1..08e6f9e8dc2 100644 --- a/py2-fs.spec +++ b/py2-fs.spec @@ -1,5 +1,5 @@ ### RPM external py2-fs 0.5.5a1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name fs diff --git a/py2-funcsigs.spec b/py2-funcsigs.spec index b8abe736b36..d1b2c1c3b4a 100644 --- a/py2-funcsigs.spec +++ b/py2-funcsigs.spec @@ -1,5 +1,5 @@ ### RPM external py2-funcsigs 1.0.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name funcsigs diff --git a/py2-functools32.spec b/py2-functools32.spec index 8905c33c318..3abf7a3e705 100644 --- a/py2-functools32.spec +++ b/py2-functools32.spec @@ -1,5 +1,5 @@ ### RPM external py2-functools32 3.2.3-2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name functools32 diff --git a/py2-futures.spec b/py2-futures.spec index df9360eefcd..f6eefaa8020 100644 --- a/py2-futures.spec +++ b/py2-futures.spec @@ -1,5 +1,5 @@ ### RPM external py2-futures 3.2.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name futures diff --git a/py2-h5py.spec b/py2-h5py.spec index 545c18f2775..67f476e4600 100644 --- a/py2-h5py.spec +++ b/py2-h5py.spec @@ -1,5 +1,5 @@ ### RPM external py2-h5py 2.7.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Requires: python py2-numpy hdf5 py2-six BuildRequires: py2-setuptools py2-cython py2-pkgconfig diff --git a/py2-hep_ml.spec b/py2-hep_ml.spec index 79d4924f089..e0c82fca311 100644 --- a/py2-hep_ml.spec +++ b/py2-hep_ml.spec @@ -1,5 +1,5 @@ ### RPM external py2-hep_ml 0.5.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name hep_ml diff --git a/py2-histogrammar.spec b/py2-histogrammar.spec index aee5055f81f..10bc6347b86 100644 --- a/py2-histogrammar.spec +++ b/py2-histogrammar.spec @@ -1,5 +1,5 @@ ### RPM external py2-histogrammar 1.0.9 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name histogrammar diff --git a/py2-html5lib.spec b/py2-html5lib.spec index dfda7902c90..fb661c6950a 100644 --- a/py2-html5lib.spec +++ b/py2-html5lib.spec @@ -1,5 +1,5 @@ ### RPM external py2-html5lib 1.0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name html5lib Requires: py2-ordereddict py2-six py2-packaging py2-setuptools py2-webencodings py2-pyparsing py2-appdirs diff --git a/py2-hyperas.spec b/py2-hyperas.spec index 1178bf7a125..5c809f58042 100644 --- a/py2-hyperas.spec +++ b/py2-hyperas.spec @@ -1,5 +1,5 @@ ### RPM external py2-hyperas 0.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Requires: py2-Keras py2-hyperopt py2-entrypoints py2-jupyter py2-nbformat py2-nbconvert diff --git a/py2-hyperopt.spec b/py2-hyperopt.spec index 2cfb512aee3..478130e4381 100644 --- a/py2-hyperopt.spec +++ b/py2-hyperopt.spec @@ -1,5 +1,5 @@ ### RPM external py2-hyperopt 0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Requires: py2-numpy py2-scipy diff --git a/py2-idna.spec b/py2-idna.spec index a5a5b412593..54b5f8aba20 100644 --- a/py2-idna.spec +++ b/py2-idna.spec @@ -1,5 +1,5 @@ ### RPM external py2-idna 2.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name idna diff --git a/py2-ipykernel.spec b/py2-ipykernel.spec index 29c7295108b..f1abc61c01c 100644 --- a/py2-ipykernel.spec +++ b/py2-ipykernel.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipykernel 4.8.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipykernel diff --git a/py2-ipython.spec b/py2-ipython.spec index d621131bb03..0dab03dfee4 100644 --- a/py2-ipython.spec +++ b/py2-ipython.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipython 5.5.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipython diff --git a/py2-ipython_genutils.spec b/py2-ipython_genutils.spec index 5ca3ae55b15..7aa6e5cf234 100644 --- a/py2-ipython_genutils.spec +++ b/py2-ipython_genutils.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipython_genutils 0.2.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipython_genutils diff --git a/py2-ipywidgets.spec b/py2-ipywidgets.spec index c8c7fe516b5..b96ae77fb82 100644 --- a/py2-ipywidgets.spec +++ b/py2-ipywidgets.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipywidgets 7.1.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipywidgets diff --git a/py2-jsonpickle.spec b/py2-jsonpickle.spec index 821b2994ffb..0ebebcadc60 100644 --- a/py2-jsonpickle.spec +++ b/py2-jsonpickle.spec @@ -1,5 +1,5 @@ ### RPM external py2-jsonpickle 0.9.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jsonpickle diff --git a/py2-jsonschema.spec b/py2-jsonschema.spec index 12cfdc5ee5a..987fcfc747f 100644 --- a/py2-jsonschema.spec +++ b/py2-jsonschema.spec @@ -1,5 +1,5 @@ ### RPM external py2-jsonschema 2.6.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jsonschema diff --git a/py2-jupyter.spec b/py2-jupyter.spec index e27df7a42dd..bd9b5e3885f 100644 --- a/py2-jupyter.spec +++ b/py2-jupyter.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter 1.0.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter diff --git a/py2-jupyter_client.spec b/py2-jupyter_client.spec index ae69def5e14..63aa7241f1e 100644 --- a/py2-jupyter_client.spec +++ b/py2-jupyter_client.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter_client 5.2.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter_client diff --git a/py2-jupyter_console.spec b/py2-jupyter_console.spec index df9bc274dbb..60c0a5b7466 100644 --- a/py2-jupyter_console.spec +++ b/py2-jupyter_console.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter_console 5.2.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter_console diff --git a/py2-jupyter_core.spec b/py2-jupyter_core.spec index 896b5b7b45b..0d934b39961 100644 --- a/py2-jupyter_core.spec +++ b/py2-jupyter_core.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter_core 4.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter_core diff --git a/py2-lint-toolfile.spec b/py2-lint-toolfile.spec index 474f496bc59..8ee8acf8637 100644 --- a/py2-lint-toolfile.spec +++ b/py2-lint-toolfile.spec @@ -14,7 +14,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-lint.xml - + EOF_TOOLFILE diff --git a/py2-lint.spec b/py2-lint.spec index 7c9dbd36a1c..cee02be3d0c 100644 --- a/py2-lint.spec +++ b/py2-lint.spec @@ -1,5 +1,5 @@ ### RPM external py2-lint 0.25.1 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: http://download.logilab.org/pub/common/logilab-common-0.57.1.tar.gz Source1: http://download.logilab.org/pub/astng/logilab-astng-0.23.1.tar.gz Source2: http://download.logilab.org/pub/pylint/pylint-%{realversion}.tar.gz diff --git a/py2-llvmlite.spec b/py2-llvmlite.spec index 89432c0d951..a195e43d182 100644 --- a/py2-llvmlite.spec +++ b/py2-llvmlite.spec @@ -1,5 +1,5 @@ ### RPM external py2-llvmlite 0.22.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} #Patch0: py2-llvmlite_lib6 %define pip_name llvmlite diff --git a/py2-matplotlib-toolfile.spec b/py2-matplotlib-toolfile.spec index df57f8ccbc2..bc54caf85e8 100644 --- a/py2-matplotlib-toolfile.spec +++ b/py2-matplotlib-toolfile.spec @@ -12,7 +12,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-matplotlib.xml - + diff --git a/py2-matplotlib.spec b/py2-matplotlib.spec index 4ed6af9eb43..88f095639f2 100644 --- a/py2-matplotlib.spec +++ b/py2-matplotlib.spec @@ -1,5 +1,5 @@ ### RPM external py2-matplotlib 1.5.2 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES} Source: https://github.com/matplotlib/matplotlib/archive/v%{realversion}.tar.gz Requires: py2-pytz py2-numpy py2-python-dateutil zlib libpng freetype py2-pyparsing py2-six BuildRequires: py2-setuptools diff --git a/py2-mistune.spec b/py2-mistune.spec index 1effe5bba85..4a9e254c46a 100644 --- a/py2-mistune.spec +++ b/py2-mistune.spec @@ -1,5 +1,5 @@ ### RPM external py2-mistune 0.8.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name mistune diff --git a/py2-mock.spec b/py2-mock.spec index 8ba483e9d98..ce5fc74a5db 100644 --- a/py2-mock.spec +++ b/py2-mock.spec @@ -1,5 +1,5 @@ ### RPM external py2-mock 2.0.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name mock diff --git a/py2-mpmath.spec b/py2-mpmath.spec index 8996c93fe3a..b15997f1d03 100644 --- a/py2-mpmath.spec +++ b/py2-mpmath.spec @@ -1,5 +1,5 @@ ### RPM external py2-mpmath 1.0.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name mpmath diff --git a/py2-nbconvert.spec b/py2-nbconvert.spec index 2beee685214..6d1054e6c97 100644 --- a/py2-nbconvert.spec +++ b/py2-nbconvert.spec @@ -1,5 +1,5 @@ ### RPM external py2-nbconvert 5.3.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name nbconvert diff --git a/py2-nbformat.spec b/py2-nbformat.spec index 458f9160f9d..1c73bd4cf82 100644 --- a/py2-nbformat.spec +++ b/py2-nbformat.spec @@ -1,5 +1,5 @@ ### RPM external py2-nbformat 4.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name nbformat diff --git a/py2-networkx.spec b/py2-networkx.spec index dd0d9d82758..f1da02a1503 100644 --- a/py2-networkx.spec +++ b/py2-networkx.spec @@ -1,5 +1,5 @@ ### RPM external py2-networkx 2.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name networkx diff --git a/py2-nose.spec b/py2-nose.spec index c6a7999cd13..d2215be8d8f 100644 --- a/py2-nose.spec +++ b/py2-nose.spec @@ -1,5 +1,5 @@ ### RPM external py2-nose 1.3.7 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name nose diff --git a/py2-notebook.spec b/py2-notebook.spec index fcff5b199ee..1987cab7952 100644 --- a/py2-notebook.spec +++ b/py2-notebook.spec @@ -1,5 +1,5 @@ ### RPM external py2-notebook 5.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name notebook diff --git a/py2-numba.spec b/py2-numba.spec index 3b88082f46a..d25b26f31a3 100644 --- a/py2-numba.spec +++ b/py2-numba.spec @@ -1,5 +1,5 @@ ### RPM external py2-numba 0.37.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name numba diff --git a/py2-numexpr.spec b/py2-numexpr.spec index 7dbd22e87b8..46f20525fad 100644 --- a/py2-numexpr.spec +++ b/py2-numexpr.spec @@ -1,9 +1,10 @@ ### RPM external py2-numexpr 2.6.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} - +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name numexpr Requires: py2-numpy +Requires: python + ## IMPORT build-with-pip diff --git a/py2-numpy-toolfile.spec b/py2-numpy-toolfile.spec index 9e9b414cd9d..7161d2bfcab 100644 --- a/py2-numpy-toolfile.spec +++ b/py2-numpy-toolfile.spec @@ -1,5 +1,6 @@ ### RPM external py2-numpy-toolfile 1.0 Requires: py2-numpy + %prep %build @@ -13,7 +14,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-numpy.xml - + diff --git a/py2-numpy.spec b/py2-numpy.spec index 7073fca9b35..96aaad43fbe 100644 --- a/py2-numpy.spec +++ b/py2-numpy.spec @@ -1,8 +1,14 @@ ### RPM external py2-numpy 1.14.1 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV SET PY2_NUMPY_REAL_VERSION %{realversion} + Source: https://github.com/numpy/numpy/releases/download/v%{realversion}/numpy-%{realversion}.tar.gz Requires: python py2-setuptools zlib OpenBLAS + +%define pythonver %(echo %{allpkgreqs} | tr ' ' '\\n' | grep ^external/python/ | cut -d/ -f3 | cut -d. -f 1,2) +%define numpyArch %(uname -m) + + %prep %setup -n numpy-%realversion @@ -38,6 +44,7 @@ sed -ideleteme 's|#!.*/bin/python|#!/usr/bin/env python|' \ %{i}/lib/python*/site-packages/numpy-*/numpy/core/tests/test_arrayprint.py \ %{i}/lib/python*/site-packages/numpy-*/numpy/distutils/from_template.py \ %{i}/lib/python*/site-packages/numpy-*/numpy/distutils/conv_template.py + find %{i} -name '*deleteme' -delete mkdir %{i}/c-api diff --git a/py2-oamap.spec b/py2-oamap.spec index 3b34e9c7747..0cd216355c9 100644 --- a/py2-oamap.spec +++ b/py2-oamap.spec @@ -1,5 +1,5 @@ ### RPM external py2-oamap 0.10.10 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name oamap diff --git a/py2-ordereddict.spec b/py2-ordereddict.spec index 307d7941dbf..c7917c43188 100644 --- a/py2-ordereddict.spec +++ b/py2-ordereddict.spec @@ -1,5 +1,5 @@ ### RPM external py2-ordereddict 1.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ordereddict diff --git a/py2-packaging.spec b/py2-packaging.spec index 9d5c6251c67..2f4bd02c3d2 100644 --- a/py2-packaging.spec +++ b/py2-packaging.spec @@ -1,5 +1,5 @@ ### RPM external py2-packaging 16.8 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name packaging diff --git a/py2-pandas.spec b/py2-pandas.spec index ef3e2b82d5c..d713fa68d0b 100644 --- a/py2-pandas.spec +++ b/py2-pandas.spec @@ -1,5 +1,5 @@ ### RPM external py2-pandas 0.22.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pandas Requires: py2-six py2-python-dateutil py2-pytz py2-numpy diff --git a/py2-pandocfilters.spec b/py2-pandocfilters.spec index 6f4abb26283..c3b6d97b939 100644 --- a/py2-pandocfilters.spec +++ b/py2-pandocfilters.spec @@ -1,5 +1,5 @@ ### RPM external py2-pandocfilters 1.4.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pandocfilters diff --git a/py2-parsimonious.spec b/py2-parsimonious.spec index c60e2a9206d..2c49c3f7724 100644 --- a/py2-parsimonious.spec +++ b/py2-parsimonious.spec @@ -1,5 +1,5 @@ ### RPM external py2-parsimonious 0.8.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name parsimonious diff --git a/py2-pathlib2.spec b/py2-pathlib2.spec index 8422073f3b0..9bc26536b51 100644 --- a/py2-pathlib2.spec +++ b/py2-pathlib2.spec @@ -1,5 +1,5 @@ ### RPM external py2-pathlib2 2.3.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pathlib2 diff --git a/py2-pbr.spec b/py2-pbr.spec index 4e53e898c3f..64c225c6c31 100644 --- a/py2-pbr.spec +++ b/py2-pbr.spec @@ -1,5 +1,5 @@ ### RPM external py2-pbr 3.1.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pbr diff --git a/py2-pexpect.spec b/py2-pexpect.spec index d22825317d0..b9e30e5644b 100644 --- a/py2-pexpect.spec +++ b/py2-pexpect.spec @@ -1,5 +1,5 @@ ### RPM external py2-pexpect 4.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pexpect diff --git a/py2-pickleshare.spec b/py2-pickleshare.spec index d4861685d87..a3a7fa85f79 100644 --- a/py2-pickleshare.spec +++ b/py2-pickleshare.spec @@ -1,5 +1,5 @@ ### RPM external py2-pickleshare 0.7.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pickleshare diff --git a/py2-pip-toolfile.spec b/py2-pip-toolfile.spec index 7283c329dc9..18e28b8fed1 100644 --- a/py2-pip-toolfile.spec +++ b/py2-pip-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pip.xml - + diff --git a/py2-pip.spec b/py2-pip.spec index f7ede44b1b5..00de7c4eb88 100644 --- a/py2-pip.spec +++ b/py2-pip.spec @@ -1,7 +1,7 @@ ### RPM external py2-pip 9.0.1 ## INITENV +PATH PATH %{i}/bin ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define my_name %(echo %n | cut -f2 -d-) Source: https://github.com/pypa/pip/archive/%{realversion}.tar.gz Requires: python py2-setuptools diff --git a/py2-pippkgs-toolfile.spec b/py2-pippkgs-toolfile.spec index bf63b61d895..3e1af4f8f67 100644 --- a/py2-pippkgs-toolfile.spec +++ b/py2-pippkgs-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pippkgs.xml - + EOF_TOOLFILE diff --git a/py2-pippkgs.spec b/py2-pippkgs.spec index 37204811b24..b7639d0e18b 100644 --- a/py2-pippkgs.spec +++ b/py2-pippkgs.spec @@ -1,5 +1,5 @@ ### RPM external py2-pippkgs 6.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: none Requires: root curl python diff --git a/py2-pippkgs_depscipy-toolfile.spec b/py2-pippkgs_depscipy-toolfile.spec index 0ea38443794..060e2b3083c 100644 --- a/py2-pippkgs_depscipy-toolfile.spec +++ b/py2-pippkgs_depscipy-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pippkgs_depscipy.xml - + EOF_TOOLFILE diff --git a/py2-pippkgs_depscipy.spec b/py2-pippkgs_depscipy.spec index e9259252772..afce32c4ec0 100644 --- a/py2-pippkgs_depscipy.spec +++ b/py2-pippkgs_depscipy.spec @@ -1,5 +1,5 @@ ### RPM external py2-pippkgs_depscipy 3.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: none Requires: root curl python py2-pippkgs py2-numpy py2-matplotlib xrootd llvm hdf5 diff --git a/py2-pkgconfig.spec b/py2-pkgconfig.spec index e877819f509..cc57a87d084 100644 --- a/py2-pkgconfig.spec +++ b/py2-pkgconfig.spec @@ -1,5 +1,5 @@ ### RPM external py2-pkgconfig 1.3.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pkgconfig diff --git a/py2-prettytable.spec b/py2-prettytable.spec index 55404e9b38d..b6be31da0ca 100644 --- a/py2-prettytable.spec +++ b/py2-prettytable.spec @@ -1,5 +1,5 @@ ### RPM external py2-prettytable 0.7.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name prettytable diff --git a/py2-prompt_toolkit.spec b/py2-prompt_toolkit.spec index e2e42362f9f..693ffbf00f5 100644 --- a/py2-prompt_toolkit.spec +++ b/py2-prompt_toolkit.spec @@ -1,5 +1,5 @@ ### RPM external py2-prompt_toolkit 1.0.15 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name prompt_toolkit diff --git a/py2-protobuf.spec b/py2-protobuf.spec index 21bc0af4755..1032dfb6a1f 100644 --- a/py2-protobuf.spec +++ b/py2-protobuf.spec @@ -1,5 +1,5 @@ ### RPM external py2-protobuf 3.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name protobuf Requires: py2-six py2-packaging py2-setuptools py2-pyparsing py2-appdirs diff --git a/py2-prwlock.spec b/py2-prwlock.spec index fd73a2f26f7..26653877be4 100644 --- a/py2-prwlock.spec +++ b/py2-prwlock.spec @@ -1,5 +1,5 @@ ### RPM external py2-prwlock 0.4.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name prwlock diff --git a/py2-psutil.spec b/py2-psutil.spec index 05effca3314..b170d69af65 100644 --- a/py2-psutil.spec +++ b/py2-psutil.spec @@ -1,5 +1,5 @@ ### RPM external py2-psutil 5.4.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-ptyprocess.spec b/py2-ptyprocess.spec index 96dc6d75a55..6b2254ee3cd 100644 --- a/py2-ptyprocess.spec +++ b/py2-ptyprocess.spec @@ -1,5 +1,5 @@ ### RPM external py2-ptyprocess 0.5.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ptyprocess diff --git a/py2-pycurl.spec b/py2-pycurl.spec index c1a1644f765..422df71ff0d 100644 --- a/py2-pycurl.spec +++ b/py2-pycurl.spec @@ -1,5 +1,5 @@ ### RPM external py2-pycurl 7.43.0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipBuildOptions --global-option="--with-openssl" --global-option="--openssl-dir=${OPENSSL_ROOT}" diff --git a/py2-pygithub-toolfile.spec b/py2-pygithub-toolfile.spec index 93e78985afb..2ff922c7d2e 100644 --- a/py2-pygithub-toolfile.spec +++ b/py2-pygithub-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pygithub.xml - + EOF_TOOLFILE diff --git a/py2-pygithub.spec b/py2-pygithub.spec index 84867618aeb..fa90e13d8e8 100644 --- a/py2-pygithub.spec +++ b/py2-pygithub.spec @@ -1,5 +1,5 @@ ### RPM external py2-pygithub 1.23.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: https://github.com/jacquev6/PyGithub/archive/v%{realversion}.zip Requires: python BuildRequires: py2-setuptools diff --git a/py2-pyparsing.spec b/py2-pyparsing.spec index 866f8d95296..255e789a10f 100644 --- a/py2-pyparsing.spec +++ b/py2-pyparsing.spec @@ -1,5 +1,5 @@ ### RPM external py2-pyparsing 2.2.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pyparsing diff --git a/py2-pysqlite.spec b/py2-pysqlite.spec index 8ad0c6f9943..b2d68827e49 100644 --- a/py2-pysqlite.spec +++ b/py2-pysqlite.spec @@ -1,5 +1,5 @@ ### RPM external py2-pysqlite 2.8.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pysqlite diff --git a/py2-pytest.spec b/py2-pytest.spec index 0d2ef94bf8c..62ac2b88519 100644 --- a/py2-pytest.spec +++ b/py2-pytest.spec @@ -1,5 +1,5 @@ ### RPM external py2-pytest 3.4.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pytest diff --git a/py2-python-dateutil.spec b/py2-python-dateutil.spec index a8fe327362a..d3e85d8858d 100644 --- a/py2-python-dateutil.spec +++ b/py2-python-dateutil.spec @@ -1,4 +1,4 @@ ### RPM external py2-python-dateutil 2.6.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-pytz.spec b/py2-pytz.spec index 3fb2a64c9fe..85197925be5 100644 --- a/py2-pytz.spec +++ b/py2-pytz.spec @@ -1,5 +1,5 @@ ### RPM external py2-pytz 2018.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pytz diff --git a/py2-pyxml.spec b/py2-pyxml.spec deleted file mode 100644 index 20b73b82295..00000000000 --- a/py2-pyxml.spec +++ /dev/null @@ -1,17 +0,0 @@ -### RPM external py2-pyxml 0.8.4 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} -Source: http://switch.dl.sourceforge.net/sourceforge/pyxml/PyXML-%{realversion}.tar.gz -Requires: python expat -Patch0: py2-pyxml-fix-as-keyword-usage-as-variable - -%prep -%setup -n PyXML-%{realversion} -%patch0 -p0 - -%build -python setup.py build - -%install -python setup.py install --prefix=%i -find %i -name '*.egg-info' -exec rm {} \; -for f in %i/bin/xmlproc_*; do perl -p -i -e 's{.*}{#!/usr/bin/env python} if $. == 1 && m{#!.*/bin/python}' $f; done diff --git a/py2-pyzmq.spec b/py2-pyzmq.spec index 988ca147096..c418b2dc841 100644 --- a/py2-pyzmq.spec +++ b/py2-pyzmq.spec @@ -1,5 +1,5 @@ ### RPM external py2-pyzmq 17.0.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pyzmq diff --git a/py2-qtconsole.spec b/py2-qtconsole.spec index e5609983524..7295708e74b 100644 --- a/py2-qtconsole.spec +++ b/py2-qtconsole.spec @@ -1,5 +1,5 @@ ### RPM external py2-qtconsole 4.3.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name qtconsole diff --git a/py2-rep.spec b/py2-rep.spec index c3ea84cca60..7f8f761352a 100644 --- a/py2-rep.spec +++ b/py2-rep.spec @@ -1,5 +1,5 @@ ### RPM external py2-rep 0.6.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name rep diff --git a/py2-repozelru.spec b/py2-repozelru.spec index 49e6988dd12..fd70969a326 100644 --- a/py2-repozelru.spec +++ b/py2-repozelru.spec @@ -1,5 +1,5 @@ ### RPM external py2-repozelru 0.7 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name repoze.lru diff --git a/py2-requests.spec b/py2-requests.spec index ba0b3fb11fd..02377f97f81 100644 --- a/py2-requests.spec +++ b/py2-requests.spec @@ -1,5 +1,5 @@ ### RPM external py2-requests 2.18.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Requires: py2-urllib3 py2-chardet py2-idna py2-certifi diff --git a/py2-root_numpy.spec b/py2-root_numpy.spec index e79997a4e58..8ed44f5f96f 100644 --- a/py2-root_numpy.spec +++ b/py2-root_numpy.spec @@ -1,5 +1,5 @@ ### RPM external py2-root_numpy 4.7.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name root_numpy diff --git a/py2-root_pandas.spec b/py2-root_pandas.spec index d7b55e43901..69c6c7db020 100644 --- a/py2-root_pandas.spec +++ b/py2-root_pandas.spec @@ -1,5 +1,5 @@ ### RPM external py2-root_pandas 0.3.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} BuildRequires: py2-numpy py2-pandas py2-root_numpy diff --git a/py2-rootpy.spec b/py2-rootpy.spec index 615fc0faa96..e395653bceb 100644 --- a/py2-rootpy.spec +++ b/py2-rootpy.spec @@ -1,5 +1,5 @@ ### RPM external py2-rootpy 1.0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipPostBuild \ diff --git a/py2-scandir.spec b/py2-scandir.spec index bd105ecf531..2c9241da8c1 100644 --- a/py2-scandir.spec +++ b/py2-scandir.spec @@ -1,5 +1,5 @@ ### RPM external py2-scandir 1.7 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name scandir diff --git a/py2-schema.spec b/py2-schema.spec index 43bc981702f..1562bc3a952 100644 --- a/py2-schema.spec +++ b/py2-schema.spec @@ -1,5 +1,5 @@ ### RPM external py2-schema 0.6.7 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name schema diff --git a/py2-scikit-learn.spec b/py2-scikit-learn.spec index ca6fcaa3c43..0cad7cca1a9 100644 --- a/py2-scikit-learn.spec +++ b/py2-scikit-learn.spec @@ -1,5 +1,5 @@ ### RPM external py2-scikit-learn 0.18.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} #%define PipPreBuild export ATLAS=None %define pip_name scikit-learn diff --git a/py2-scipy.spec b/py2-scipy.spec index 2a605ef1575..25f67388c23 100644 --- a/py2-scipy.spec +++ b/py2-scipy.spec @@ -1,5 +1,5 @@ ### RPM external py2-scipy 1.0.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name scipy Requires: py2-numpy diff --git a/py2-seaborn.spec b/py2-seaborn.spec index e01e35db3ad..594edbc0b99 100644 --- a/py2-seaborn.spec +++ b/py2-seaborn.spec @@ -1,5 +1,5 @@ ### RPM external py2-seaborn 0.8.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Requires: py2-matplotlib py2-numpy py2-scipy py2-pandas diff --git a/py2-setuptools-toolfile.spec b/py2-setuptools-toolfile.spec index bc0b1fdf56e..33d13b0ec74 100644 --- a/py2-setuptools-toolfile.spec +++ b/py2-setuptools-toolfile.spec @@ -12,7 +12,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-setuptools.xml - + EOF_TOOLFILE diff --git a/py2-setuptools.spec b/py2-setuptools.spec index b62631052c6..ef225fc8dc7 100644 --- a/py2-setuptools.spec +++ b/py2-setuptools.spec @@ -1,5 +1,5 @@ ### RPM external py2-setuptools 28.3.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: https://pypi.python.org/packages/6b/dd/a7de8caeeffab76bacf56972b3f090c12e0ae6932245abbce706690a6436/setuptools-28.3.0.tar.gz Requires: python diff --git a/py2-shutil_get_terminal_size.spec b/py2-shutil_get_terminal_size.spec index c62f030ce3b..0e850544801 100644 --- a/py2-shutil_get_terminal_size.spec +++ b/py2-shutil_get_terminal_size.spec @@ -1,5 +1,5 @@ ### RPM external py2-shutil_get_terminal_size 1.0.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name backports.shutil_get_terminal_size diff --git a/py2-simplegeneric.spec b/py2-simplegeneric.spec index b2e865c51a8..19dbdeea91a 100644 --- a/py2-simplegeneric.spec +++ b/py2-simplegeneric.spec @@ -1,5 +1,5 @@ ### RPM external py2-simplegeneric 0.8.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name simplegeneric diff --git a/py2-singledispatch.spec b/py2-singledispatch.spec index df6f755754b..92f2cef5d4b 100644 --- a/py2-singledispatch.spec +++ b/py2-singledispatch.spec @@ -1,5 +1,5 @@ ### RPM external py2-singledispatch 3.4.0.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name singledispatch diff --git a/py2-six-toolfile.spec b/py2-six-toolfile.spec index c7adb29ec52..28e27e8a8f2 100644 --- a/py2-six-toolfile.spec +++ b/py2-six-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-six.xml - + EOF_TOOLFILE diff --git a/py2-six.spec b/py2-six.spec index 83f8045fbef..953c8075567 100644 --- a/py2-six.spec +++ b/py2-six.spec @@ -1,5 +1,5 @@ ### RPM external py2-six 1.10.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define my_name %(echo %n | cut -f2 -d-) Source: https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-%{realversion}.tar.gz Requires: python diff --git a/py2-sqlalchemy-toolfile.spec b/py2-sqlalchemy-toolfile.spec index 8a8de675ef4..9c6c4346600 100644 --- a/py2-sqlalchemy-toolfile.spec +++ b/py2-sqlalchemy-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-sqlalchemy.xml - + EOF_TOOLFILE diff --git a/py2-sqlalchemy.spec b/py2-sqlalchemy.spec index 0f419b3930d..3c77d7a0f6f 100644 --- a/py2-sqlalchemy.spec +++ b/py2-sqlalchemy.spec @@ -1,9 +1,13 @@ ### RPM external py2-sqlalchemy 1.1.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES} Source: https://pypi.python.org/packages/ca/ca/c2436fdb7bb75d772d9fa17ba60c4cfded6284eed053a7274b2beb96596a/SQLAlchemy-%{realversion}.tar.gz Requires: python py2-setuptools +#%define pythonver %(echo %{allpkgreqs} | tr ' ' '\\n' | grep ^external/python/ | cut -d/ -f3 | cut -d. -f 1,2) +#%define pyArch %(uname -m) + + Patch0: py2-sqlalchemy-1.1.4-add-frontier-dialect Patch1: py2-sqlalchemy-1.1.4-fix-sqlite-dialect-timestamp diff --git a/py2-sqlobject.spec b/py2-sqlobject.spec index 68717db74f1..c8c6684b983 100644 --- a/py2-sqlobject.spec +++ b/py2-sqlobject.spec @@ -1,6 +1,6 @@ ### RPM external py2-sqlobject 0.8.0 %define pythonv %(echo $PYTHON_VERSION | cut -f1,2 -d.) -## INITENV +PATH PYTHONPATH %i/lib/python`echo $PYTHON_VERSION | cut -f1,2 -d.`/site-packages +## INITENV +PATH PYTHON27PATH %i/lib/python`echo $PYTHON_VERSION | cut -f1,2 -d.`/site-packages %define distname SQLObject-%realversion Source: http://cheeseshop.python.org/packages/source/S/SQLObject/%{distname}.tar.gz diff --git a/py2-sympy.spec b/py2-sympy.spec index af30ef59dd4..c590c264951 100644 --- a/py2-sympy.spec +++ b/py2-sympy.spec @@ -1,5 +1,5 @@ ### RPM external py2-sympy 1.1.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipPostBuild perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/isympy %define pip_name sympy diff --git a/py2-tables.spec b/py2-tables.spec index ffa3f578f41..4e4e95366c5 100644 --- a/py2-tables.spec +++ b/py2-tables.spec @@ -1,5 +1,5 @@ ### RPM external py2-tables 3.4.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Patch0: py2-tables-fix-for-aarch64_v2 %define pip_name tables Requires: py2-numexpr py2-six py2-numpy hdf5 bz2lib diff --git a/py2-tensorflow.spec b/py2-tensorflow.spec index 435d11e323d..8de4b868c39 100644 --- a/py2-tensorflow.spec +++ b/py2-tensorflow.spec @@ -1,5 +1,6 @@ ### RPM external py2-tensorflow 1.5.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} + Source: none diff --git a/py2-terminado.spec b/py2-terminado.spec index e4717e307c7..7d1d8872333 100644 --- a/py2-terminado.spec +++ b/py2-terminado.spec @@ -1,5 +1,5 @@ ### RPM external py2-terminado 0.8.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name terminado diff --git a/py2-testpath.spec b/py2-testpath.spec index 7718c170260..dc565f380af 100644 --- a/py2-testpath.spec +++ b/py2-testpath.spec @@ -1,5 +1,5 @@ ### RPM external py2-testpath 0.3.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipDownloadOptions --no-deps%%20--no-binary%%3D:none: %define pip_name testpath diff --git a/py2-theanets.spec b/py2-theanets.spec index f2718296d12..79ce15bae41 100644 --- a/py2-theanets.spec +++ b/py2-theanets.spec @@ -1,5 +1,5 @@ ### RPM external py2-theanets 0.7.3 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name theanets Requires: py2-numpy py2-Theano py2-downhill py2-climate diff --git a/py2-thriftpy.spec b/py2-thriftpy.spec index 4c33b7101da..c52b75aac0a 100644 --- a/py2-thriftpy.spec +++ b/py2-thriftpy.spec @@ -1,5 +1,5 @@ ### RPM external py2-thriftpy 0.3.9 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} BuildRequires: py2-cython diff --git a/py2-tornado.spec b/py2-tornado.spec index d145aa2183d..b08b913c9d2 100644 --- a/py2-tornado.spec +++ b/py2-tornado.spec @@ -1,5 +1,5 @@ ### RPM external py2-tornado 5.0b1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name tornado diff --git a/py2-tqdm.spec b/py2-tqdm.spec index a1f0b1dea2c..075cfc3fe9c 100644 --- a/py2-tqdm.spec +++ b/py2-tqdm.spec @@ -1,5 +1,5 @@ ### RPM external py2-tqdm 4.19.6 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name tqdm diff --git a/py2-traitlets.spec b/py2-traitlets.spec index c830a724796..96a5c2489e5 100644 --- a/py2-traitlets.spec +++ b/py2-traitlets.spec @@ -1,5 +1,5 @@ ### RPM external py2-traitlets 4.3.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name traitlets diff --git a/py2-uncertainties.spec b/py2-uncertainties.spec index ac4ee074464..68a512746c6 100644 --- a/py2-uncertainties.spec +++ b/py2-uncertainties.spec @@ -1,5 +1,5 @@ ### RPM external py2-uncertainties 3.0.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name uncertainties diff --git a/py2-uproot.spec b/py2-uproot.spec index ce50d93dcdd..923291746fa 100644 --- a/py2-uproot.spec +++ b/py2-uproot.spec @@ -1,5 +1,5 @@ ### RPM external py2-uproot 2.6.19 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name uproot diff --git a/py2-urllib3.spec b/py2-urllib3.spec index 04d5c28469f..eb44cf803b2 100644 --- a/py2-urllib3.spec +++ b/py2-urllib3.spec @@ -1,5 +1,5 @@ ### RPM external py2-urllib3 1.22 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name urllib3 diff --git a/py2-virtualenv.spec b/py2-virtualenv.spec index 66b7e389358..a9e1ec79f45 100644 --- a/py2-virtualenv.spec +++ b/py2-virtualenv.spec @@ -1,5 +1,5 @@ ### RPM external py2-virtualenv 15.1.0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name virtualenv diff --git a/py2-virtualenvwrapper.spec b/py2-virtualenvwrapper.spec index 0de37cf248f..c82fa35218a 100644 --- a/py2-virtualenvwrapper.spec +++ b/py2-virtualenvwrapper.spec @@ -1,5 +1,5 @@ ### RPM external py2-virtualenvwrapper 4.8.2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name virtualenvwrapper diff --git a/py2-wcwidth.spec b/py2-wcwidth.spec index a1896e5a505..1fe948acf71 100644 --- a/py2-wcwidth.spec +++ b/py2-wcwidth.spec @@ -1,5 +1,5 @@ ### RPM external py2-wcwidth 0.1.7 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name wcwidth diff --git a/py2-webencodings.spec b/py2-webencodings.spec index c91249507d9..fc813ce2ebe 100644 --- a/py2-webencodings.spec +++ b/py2-webencodings.spec @@ -1,5 +1,5 @@ ### RPM external py2-webencodings 0.5.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name webencodings diff --git a/py2-werkzeug.spec b/py2-werkzeug.spec index 0e1fb643a14..0ff552d8062 100644 --- a/py2-werkzeug.spec +++ b/py2-werkzeug.spec @@ -1,5 +1,5 @@ ### RPM external py2-werkzeug 0.14.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Werkzeug diff --git a/py2-wheel.spec b/py2-wheel.spec index e1e676c04b1..442fb891f28 100644 --- a/py2-wheel.spec +++ b/py2-wheel.spec @@ -1,5 +1,5 @@ ### RPM external py2-wheel 0.30.0a0 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name wheel diff --git a/py2-widgetsnbextension.spec b/py2-widgetsnbextension.spec index fd5685e0d60..3b9a1550d70 100644 --- a/py2-widgetsnbextension.spec +++ b/py2-widgetsnbextension.spec @@ -1,5 +1,5 @@ ### RPM external py2-widgetsnbextension 3.1.4 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name widgetsnbextension diff --git a/py2-xgboost.spec b/py2-xgboost.spec index ac7442808e6..4088163bbf5 100644 --- a/py2-xgboost.spec +++ b/py2-xgboost.spec @@ -1,5 +1,5 @@ ### RPM external py2-xgboost 0.6a2 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Patch0: xgboost-0.6a2-fix-gcc7 Patch1: xgboost-0.6a2-msse2 diff --git a/py2-xrootdpyfs.spec b/py2-xrootdpyfs.spec index 5aa96a49062..92247c44586 100644 --- a/py2-xrootdpyfs.spec +++ b/py2-xrootdpyfs.spec @@ -1,5 +1,5 @@ ### RPM external py2-xrootdpyfs 0.1.5 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Requires: xrootd py2-fs diff --git a/pyminuit2-toolfile.spec b/pyminuit2-toolfile.spec index dab10225e0f..ca61479687b 100644 --- a/pyminuit2-toolfile.spec +++ b/pyminuit2-toolfile.spec @@ -12,7 +12,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/pyminuit2.xml - + EOF_TOOLFILE diff --git a/pyminuit2.spec b/pyminuit2.spec index cd4d82b0519..b628a2af469 100644 --- a/pyminuit2.spec +++ b/pyminuit2.spec @@ -1,5 +1,5 @@ ### RPM external pyminuit2 0.0.1 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: http://pyminuit2.googlecode.com/files/%{n}-%{realversion}.tar.gz Requires: root diff --git a/pyqt-toolfile.spec b/pyqt-toolfile.spec index e7be4993966..7655b069c86 100644 --- a/pyqt-toolfile.spec +++ b/pyqt-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/pyqt.xml - + diff --git a/pyqt.spec b/pyqt.spec index bca7c562d52..2c48d62fecb 100644 --- a/pyqt.spec +++ b/pyqt.spec @@ -1,5 +1,5 @@ ### RPM external pyqt 4.11.4 -## INITENV +PATH PYTHONPATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages +## INITENV +PATH PYTHON27PATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages %define tag 2d7924145efbdb1eafa9032646d828088c5950d5 %define branch cms/v%{realversion} %define github_user cms-externals diff --git a/python-ldap-toolfile.spec b/python-ldap-toolfile.spec index 1bdb77cbd83..789006b9910 100644 --- a/python-ldap-toolfile.spec +++ b/python-ldap-toolfile.spec @@ -14,7 +14,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/python-ldap.xml - + diff --git a/python-ldap.spec b/python-ldap.spec index 15c2c5fcfc9..c0501781b76 100644 --- a/python-ldap.spec +++ b/python-ldap.spec @@ -1,5 +1,5 @@ ### RPM external python-ldap 2.4.10 -## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: http://pypi.python.org/packages/source/p/%{n}/%{n}-%{realversion}.tar.gz Requires: python openssl openldap diff --git a/python.spec b/python.spec index 9bbf2305667..8117ac7ac8b 100644 --- a/python.spec +++ b/python.spec @@ -193,8 +193,9 @@ done echo "from os import environ" > %i/lib/python2.7/sitecustomize.py echo "if 'PYTHON27PATH' in environ:" >> %i/lib/python2.7/sitecustomize.py -echo " import sys" >> %i/lib/python2.7/sitecustomize.py -echo " sys.path =environ['PYTHON27PATH'].split(':') + sys.path">> %i/lib/python2.7/sitecustomize.py +echo " import os,site" >> %i/lib/python2.7/sitecustomize.py +echo " for p in environ['PYTHON27PATH'].split(os.pathsep):">> %i/lib/python2.7/sitecustomize.py +echo " site.addsitedir(p)">> %i/lib/python2.7/sitecustomize.py %post diff --git a/python3.spec b/python3.spec index 1d537b9deb0..696071d59bd 100644 --- a/python3.spec +++ b/python3.spec @@ -74,8 +74,10 @@ rm -rf %{i}/share %{i}/lib/python*/test %{i}/lib/python%{pythonv}/distutils/test echo "from os import environ" > %i/lib/python%{pythonv}/sitecustomize.py echo "if 'PYTHON3PATH' in environ:" >> %i/lib/python%{pythonv}/sitecustomize.py -echo " import sys" >> %i/lib/python%{pythonv}/sitecustomize.py -echo " sys.path =environ['PYTHON3PATH'].split(':') + sys.path">> %i/lib/python%{pythonv}/sitecustomize.py +echo " import os,site" >> %i/lib/python%{pythonv}/sitecustomize.py +echo " for p in environ['PYTHON3PATH'].split(os.pathsep):">> %i/lib/python%{pythonv}/sitecustomize.py +echo " site.addsitedir(p)">> %i/lib/python%{pythonv}/sitecustomize.py + diff --git a/rivet-toolfile.spec b/rivet-toolfile.spec index d37145cf626..7a04938210e 100644 --- a/rivet-toolfile.spec +++ b/rivet-toolfile.spec @@ -16,7 +16,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/rivet.xml - + diff --git a/root-toolfile.spec b/root-toolfile.spec index 92c33b1e69b..d83aa8ef68e 100644 --- a/root-toolfile.spec +++ b/root-toolfile.spec @@ -27,7 +27,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/root_interface.xml - + diff --git a/root.spec b/root.spec index dd4efaa4b3a..63defd5d45f 100644 --- a/root.spec +++ b/root.spec @@ -1,5 +1,5 @@ ### RPM lcg root 6.10.09 -## INITENV +PATH PYTHONPATH %{i}/lib +## INITENV +PATH PYTHON27PATH %{i}/lib ## INITENV SET ROOTSYS %{i} %define tag 287883fd1b96f3a53c80032651656565c3a04901 %define branch cms/v6-10-00-patches/b35729a diff --git a/scons.spec b/scons.spec index dcc28ea4257..08b6def9c63 100644 --- a/scons.spec +++ b/scons.spec @@ -1,5 +1,5 @@ ### RPM external scons 1.2.0 -## INITENV +PATH PYTHONPATH %i/lib/%n-%realversion +## INITENV +PATH PYTHON27PATH %i/lib/%n-%realversion Source: http://prdownloads.sourceforge.net/scons/scons-%realversion.tar.gz Requires: python diff --git a/sherpa-toolfile.spec b/sherpa-toolfile.spec index c46ced25e10..7e81943e079 100644 --- a/sherpa-toolfile.spec +++ b/sherpa-toolfile.spec @@ -26,7 +26,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sherpa.xml - + diff --git a/sip-toolfile.spec b/sip-toolfile.spec index 48716161e97..0e8bd874824 100644 --- a/sip-toolfile.spec +++ b/sip-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sip.xml - + EOF_TOOLFILE diff --git a/tensorflow-sources.spec b/tensorflow-sources.spec index 32bf0465636..5e43b0fb25c 100644 --- a/tensorflow-sources.spec +++ b/tensorflow-sources.spec @@ -140,16 +140,9 @@ done cp -p eigen/signature_of_eigen3_matrix_library ${incdir}/eigen/ || exit 1 %install -#export PYTHONPATH=%{i}/lib/python:${PYTHONPATH} -#export PYTHONPATH=%{i}/${PYTHON_LIB_SITE_PACKAGES}:${PYTHONPATH} -bazel-bin/tensorflow/tools/pip_package/build_pip_package %{i} -#it looks like this tensorflow build pushes a number of third-party things to the bin area for now -#that needs to be cleaned up -#perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/* +bazel-bin/tensorflow/tools/pip_package/build_pip_package %{i} cp $PWD/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz %{i} -#tar xfz $PWD/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz -C %{i} - tar cfz %{i}/libtensorflow_cc.tar.gz tensorflow_cc/. diff --git a/xrootd-toolfile.spec b/xrootd-toolfile.spec index 98942e94d0f..7160fd254bc 100644 --- a/xrootd-toolfile.spec +++ b/xrootd-toolfile.spec @@ -18,7 +18,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml - + diff --git a/yoda-toolfile.spec b/yoda-toolfile.spec index 1bb97ebcfa4..520b86ff754 100644 --- a/yoda-toolfile.spec +++ b/yoda-toolfile.spec @@ -16,7 +16,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/yoda.xml - + EOF_TOOLFILE diff --git a/yui.spec b/yui.spec deleted file mode 100644 index 0dfae01452b..00000000000 --- a/yui.spec +++ /dev/null @@ -1,24 +0,0 @@ -### RPM external yui 2.8.1 -Source: http://yuilibrary.com/downloads/yui2/yui_%realversion.zip - -# We obsolete each previous release to force them to be removed -Obsoletes: external+yui+2.7.0b - -%prep -rm -rf %{_builddir}/yui -mkdir -p %{_builddir}/yui -cd %{_builddir} -unzip %{_sourcedir}/yui_%realversion.zip -%build -%install -pwd -cp -r yui/* %i -mkdir -p %i/etc -cat << \EOF_CHERRYPY_CONF > %i/etc/cherrypy.conf -# Serve a complete directory -[/] -tools.staticdir.on = True -tools.staticdir.dir = %i/build -EOF_CHERRYPY_CONF -%post -%{relocateConfig}etc/cherrypy.conf