From 0e98a780b534ab581910e6cdea1f465ea935c0cf Mon Sep 17 00:00:00 2001 From: David Date: Fri, 24 Mar 2017 10:12:38 +0100 Subject: [PATCH] fix syntax for csh --- cherrypy.spec | 2 +- cython.spec | 2 +- py2-Jinja.spec | 2 +- py2-Jinja2.spec | 2 +- py2-Keras.spec | 2 +- py2-MarkupSafe.spec | 2 +- py2-PyYAML.spec | 2 +- py2-Pygments.spec | 2 +- py2-Theano.spec | 2 +- py2-appdirs.spec | 2 +- py2-argparse.spec | 2 +- py2-backports_abc.spec | 2 +- py2-backportsssl_match_hostname.spec | 2 +- py2-bleach.spec | 2 +- py2-certifi.spec | 2 +- py2-cjson.spec | 2 +- py2-configparser.spec | 2 +- py2-cx-oracle.spec | 2 +- py2-cycler.spec | 2 +- py2-dablooms.spec | 2 +- py2-decorator.spec | 2 +- py2-deepdish.spec | 2 +- py2-docopt.spec | 2 +- py2-dxr.spec | 2 +- py2-entrypoints.spec | 2 +- py2-enum34.spec | 2 +- py2-funcsigs.spec | 2 +- py2-functools32.spec | 2 +- py2-futures.spec | 2 +- py2-h5py.spec | 2 +- py2-histogrammar.spec | 2 +- py2-html5lib.spec | 2 +- py2-ipykernel.spec | 2 +- py2-ipython.spec | 2 +- py2-ipython_genutils.spec | 2 +- py2-ipywidgets.spec | 2 +- py2-jsonschema.spec | 2 +- py2-jupyter.spec | 2 +- py2-jupyter_client.spec | 2 +- py2-jupyter_console.spec | 2 +- py2-jupyter_core.spec | 2 +- py2-lint.spec | 2 +- py2-matplotlib.spec | 2 +- py2-mistune.spec | 2 +- py2-mock.spec | 2 +- py2-mpmath.spec | 2 +- py2-nbconvert.spec | 2 +- py2-nbformat.spec | 2 +- py2-networkx.spec | 2 +- py2-nose.spec | 2 +- py2-notebook.spec | 2 +- py2-numexpr.spec | 2 +- py2-numpy.spec | 4 ++-- py2-ordereddict.spec | 2 +- py2-packaging.spec | 2 +- py2-pandas.spec | 2 +- py2-pandocfilters.spec | 2 +- py2-parsimonious.spec | 2 +- py2-pathlib2.spec | 2 +- py2-pbr.spec | 2 +- py2-pexpect.spec | 2 +- py2-pickleshare.spec | 2 +- py2-pip.spec | 2 +- py2-pippkgs.spec | 10 +++++----- py2-pippkgs_depscipy.spec | 12 ++++++------ py2-pkgconfig.spec | 2 +- py2-prettytable.spec | 2 +- py2-prompt_toolkit.spec | 2 +- py2-protobuf.spec | 2 +- py2-psutil.spec | 2 +- py2-ptyprocess.spec | 2 +- py2-pycurl.spec | 2 +- py2-pygithub.spec | 2 +- py2-pyparsing.spec | 2 +- py2-pysqlite.spec | 2 +- py2-python-dateutil.spec | 2 +- py2-pytz.spec | 2 +- py2-pyxml.spec | 2 +- py2-pyzmq.spec | 2 +- py2-qtconsole.spec | 2 +- py2-repozelru.spec | 2 +- py2-requests.spec | 2 +- py2-root_numpy.spec | 2 +- py2-rootpy.spec | 2 +- py2-scandir.spec | 2 +- py2-schema.spec | 2 +- py2-scikit-learn.spec | 2 +- py2-scipy.spec | 2 +- py2-setuptools.spec | 2 +- py2-shutil_get_terminal_size.spec | 2 +- py2-simplegeneric.spec | 2 +- py2-singledispatch.spec | 2 +- py2-six.spec | 2 +- py2-sqlalchemy.spec | 6 +++--- py2-sympy.spec | 2 +- py2-tables.spec | 2 +- py2-tensorflow.spec | 2 +- py2-terminado.spec | 2 +- py2-testpath.spec | 2 +- py2-tornado.spec | 2 +- py2-tqdm.spec | 2 +- py2-traitlets.spec | 2 +- py2-wcwidth.spec | 2 +- py2-webencodings.spec | 2 +- py2-widgetsnbextension.spec | 2 +- 105 files changed, 117 insertions(+), 117 deletions(-) diff --git a/cherrypy.spec b/cherrypy.spec index 4d2314eb838..a1abfc608c9 100644 --- a/cherrypy.spec +++ b/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 diff --git a/cython.spec b/cython.spec index e72788ae180..c900b615d14 100644 --- a/cython.spec +++ b/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 diff --git a/py2-Jinja.spec b/py2-Jinja.spec index a7e7e348b74..aae66e3062d 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Jinja diff --git a/py2-Jinja2.spec b/py2-Jinja2.spec index 0c40458dfc3..d99c271ac31 100644 --- a/py2-Jinja2.spec +++ b/py2-Jinja2.spec @@ -1,5 +1,5 @@ ### RPM external py2-Jinja2 2.9.5 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Jinja2 diff --git a/py2-Keras.spec b/py2-Keras.spec index 36f7867a044..cc1e265a9b7 100644 --- a/py2-Keras.spec +++ b/py2-Keras.spec @@ -1,5 +1,5 @@ ### RPM external py2-Keras 1.2.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Keras diff --git a/py2-MarkupSafe.spec b/py2-MarkupSafe.spec index 33fcecf6e24..ffc4cbca6a4 100644 --- a/py2-MarkupSafe.spec +++ b/py2-MarkupSafe.spec @@ -1,5 +1,5 @@ ### RPM external py2-MarkupSafe 0.23 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name MarkupSafe diff --git a/py2-PyYAML.spec b/py2-PyYAML.spec index b7a9b02b5c3..935cd02eb57 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 PYTHONPATH %{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 b06c46f9f97..1e23aa88c29 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Pygments diff --git a/py2-Theano.spec b/py2-Theano.spec index ecbbcce665e..2ba7c8e2234 100644 --- a/py2-Theano.spec +++ b/py2-Theano.spec @@ -1,5 +1,5 @@ ### RPM external py2-Theano 0.8.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name Theano diff --git a/py2-appdirs.spec b/py2-appdirs.spec index 25623631015..291712d7898 100644 --- a/py2-appdirs.spec +++ b/py2-appdirs.spec @@ -1,5 +1,5 @@ ### RPM external py2-appdirs 1.4.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name appdirs diff --git a/py2-argparse.spec b/py2-argparse.spec index 50e55f09bff..f3fdb80d828 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name argparse diff --git a/py2-backports_abc.spec b/py2-backports_abc.spec index bc92d8682c5..0296ac123ea 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 PYTHONPATH %{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 97abdd33905..04ce87f34f9 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name backports.ssl_match_hostname diff --git a/py2-bleach.spec b/py2-bleach.spec index 889ce967507..3c967839130 100644 --- a/py2-bleach.spec +++ b/py2-bleach.spec @@ -1,5 +1,5 @@ ### RPM external py2-bleach 1.5.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name bleach diff --git a/py2-certifi.spec b/py2-certifi.spec index fb7a781b45b..e8567fb6233 100644 --- a/py2-certifi.spec +++ b/py2-certifi.spec @@ -1,5 +1,5 @@ ### RPM external py2-certifi 2017.1.23 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name certifi diff --git a/py2-cjson.spec b/py2-cjson.spec index 482e93910df..2c89bb58559 100644 --- a/py2-cjson.spec +++ b/py2-cjson.spec @@ -1,5 +1,5 @@ ### RPM external py2-cjson 1.1.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name python-cjson diff --git a/py2-configparser.spec b/py2-configparser.spec index 60b70bcbe36..0c31f43d251 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-cx-oracle.spec b/py2-cx-oracle.spec index 6a1e411ede1..f9c3bf839b0 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 PYTHONPATH %{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 ef4cf485e48..2078a921bbb 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name cycler diff --git a/py2-dablooms.spec b/py2-dablooms.spec index 2f20084232b..276ca45f3b5 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 PYTHONPATH %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 6762b74172e..c0c110eadd7 100644 --- a/py2-decorator.spec +++ b/py2-decorator.spec @@ -1,5 +1,5 @@ ### RPM external py2-decorator 4.0.11 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name decorator diff --git a/py2-deepdish.spec b/py2-deepdish.spec index cbb53273dfb..59859e6bcca 100644 --- a/py2-deepdish.spec +++ b/py2-deepdish.spec @@ -1,5 +1,5 @@ ### RPM external py2-deepdish 0.3.4 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name deepdish diff --git a/py2-docopt.spec b/py2-docopt.spec index dff2370d126..d15de966d0c 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name docopt diff --git a/py2-dxr.spec b/py2-dxr.spec index 868f25f48ef..e7d93bdff5d 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 PYTHONPATH %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 30441924451..9e44f8585c7 100644 --- a/py2-entrypoints.spec +++ b/py2-entrypoints.spec @@ -1,5 +1,5 @@ ### RPM external py2-entrypoints 0.2.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{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 482f7fe6233..162f8bd1cae 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-funcsigs.spec b/py2-funcsigs.spec index b550281b1d9..b8abe736b36 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name funcsigs diff --git a/py2-functools32.spec b/py2-functools32.spec index 01ff3bcf245..8905c33c318 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name functools32 diff --git a/py2-futures.spec b/py2-futures.spec index 620c63452c3..2a931208334 100644 --- a/py2-futures.spec +++ b/py2-futures.spec @@ -1,5 +1,5 @@ ### RPM external py2-futures 3.0.5 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name futures diff --git a/py2-h5py.spec b/py2-h5py.spec index ce022eaecf9..ae4e9b55285 100644 --- a/py2-h5py.spec +++ b/py2-h5py.spec @@ -1,5 +1,5 @@ ### RPM external py2-h5py 2.6.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## 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 py2-six diff --git a/py2-histogrammar.spec b/py2-histogrammar.spec index e6ff7b1038a..821319fed58 100644 --- a/py2-histogrammar.spec +++ b/py2-histogrammar.spec @@ -1,5 +1,5 @@ ### RPM external py2-histogrammar 1.0.6 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name histogrammar diff --git a/py2-html5lib.spec b/py2-html5lib.spec index f237caa5c3d..86a68ba0700 100644 --- a/py2-html5lib.spec +++ b/py2-html5lib.spec @@ -1,5 +1,5 @@ ### RPM external py2-html5lib 0.9999999 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} #bleach can not currently use anything newer than 0.9999999 (7 9s) diff --git a/py2-ipykernel.spec b/py2-ipykernel.spec index eaf6247193b..9673fe6adeb 100644 --- a/py2-ipykernel.spec +++ b/py2-ipykernel.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipykernel 4.5.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipykernel diff --git a/py2-ipython.spec b/py2-ipython.spec index d4d0ec1a665..973f31e6185 100644 --- a/py2-ipython.spec +++ b/py2-ipython.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipython 5.2.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipython diff --git a/py2-ipython_genutils.spec b/py2-ipython_genutils.spec index 0f6b029fa9a..c8590b77df3 100644 --- a/py2-ipython_genutils.spec +++ b/py2-ipython_genutils.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipython_genutils 0.1.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipython_genutils diff --git a/py2-ipywidgets.spec b/py2-ipywidgets.spec index 260a19d09b1..8f0a7bfdfdf 100644 --- a/py2-ipywidgets.spec +++ b/py2-ipywidgets.spec @@ -1,5 +1,5 @@ ### RPM external py2-ipywidgets 5.2.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ipywidgets diff --git a/py2-jsonschema.spec b/py2-jsonschema.spec index 55d632f6a50..a704a251636 100644 --- a/py2-jsonschema.spec +++ b/py2-jsonschema.spec @@ -1,5 +1,5 @@ ### RPM external py2-jsonschema 2.5.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jsonschema diff --git a/py2-jupyter.spec b/py2-jupyter.spec index 519a211698f..e27df7a42dd 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter diff --git a/py2-jupyter_client.spec b/py2-jupyter_client.spec index cc2a1f78776..4b22fdab11d 100644 --- a/py2-jupyter_client.spec +++ b/py2-jupyter_client.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter_client 4.4.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter_client diff --git a/py2-jupyter_console.spec b/py2-jupyter_console.spec index 3847ae84b9b..63c42adeea9 100644 --- a/py2-jupyter_console.spec +++ b/py2-jupyter_console.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter_console 5.0.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter_console diff --git a/py2-jupyter_core.spec b/py2-jupyter_core.spec index 61a8d48d944..884624bd219 100644 --- a/py2-jupyter_core.spec +++ b/py2-jupyter_core.spec @@ -1,5 +1,5 @@ ### RPM external py2-jupyter_core 4.2.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name jupyter_core diff --git a/py2-lint.spec b/py2-lint.spec index 46ed93093b6..7c9dbd36a1c 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 PYTHONPATH %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-matplotlib.spec b/py2-matplotlib.spec index 7f8a1affeb3..4ed6af9eb43 100644 --- a/py2-matplotlib.spec +++ b/py2-matplotlib.spec @@ -34,4 +34,4 @@ export CPLUS_INCLUDE_PATH=${FREETYPE_ROOT}/include/freetype2:${LIBPNG_ROOT}/incl python setup.py install --prefix=%i --single-version-externally-managed --record=/dev/null # No need for test files -rm -rf %i/$PYTHON_LIB_SITE_PACKAGES/matplotlib/tests +rm -rf %i/${PYTHON_LIB_SITE_PACKAGES}/matplotlib/tests diff --git a/py2-mistune.spec b/py2-mistune.spec index bd8e5a119aa..130dbb31a29 100644 --- a/py2-mistune.spec +++ b/py2-mistune.spec @@ -1,5 +1,5 @@ ### RPM external py2-mistune 0.7.3 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name mistune diff --git a/py2-mock.spec b/py2-mock.spec index 62d9a3487a5..8ba483e9d98 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name mock diff --git a/py2-mpmath.spec b/py2-mpmath.spec index 723eec96ed8..fa3a66e8676 100644 --- a/py2-mpmath.spec +++ b/py2-mpmath.spec @@ -1,5 +1,5 @@ ### RPM external py2-mpmath 0.19 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name mpmath diff --git a/py2-nbconvert.spec b/py2-nbconvert.spec index af07a23bb88..71715812352 100644 --- a/py2-nbconvert.spec +++ b/py2-nbconvert.spec @@ -1,5 +1,5 @@ ### RPM external py2-nbconvert 5.1.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name nbconvert diff --git a/py2-nbformat.spec b/py2-nbformat.spec index 4345f597418..0093c73466c 100644 --- a/py2-nbformat.spec +++ b/py2-nbformat.spec @@ -1,5 +1,5 @@ ### RPM external py2-nbformat 4.2.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name nbformat diff --git a/py2-networkx.spec b/py2-networkx.spec index 10e6e61cf02..03981aec204 100644 --- a/py2-networkx.spec +++ b/py2-networkx.spec @@ -1,5 +1,5 @@ ### RPM external py2-networkx 1.11 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name networkx diff --git a/py2-nose.spec b/py2-nose.spec index 540b182630c..c6a7999cd13 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name nose diff --git a/py2-notebook.spec b/py2-notebook.spec index 5ab0299183b..202a9c29e2a 100644 --- a/py2-notebook.spec +++ b/py2-notebook.spec @@ -1,5 +1,5 @@ ### RPM external py2-notebook 4.3.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name notebook diff --git a/py2-numexpr.spec b/py2-numexpr.spec index f7c281342be..3a98feaa690 100644 --- a/py2-numexpr.spec +++ b/py2-numexpr.spec @@ -1,5 +1,5 @@ ### RPM external py2-numexpr 2.6.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name numexpr diff --git a/py2-numpy.spec b/py2-numpy.spec index e3eeb394383..2519a6ccb65 100644 --- a/py2-numpy.spec +++ b/py2-numpy.spec @@ -27,10 +27,10 @@ atlas_libs = openblas atlas_dirs = $OPENBLAS_ROOT/lib EOF -mkdir -p %i/$PYTHON_LIB_SITE_PACKAGES +mkdir -p %i/${PYTHON_LIB_SITE_PACKAGES} python setup.py build %{makeprocesses} --fcompiler=gnu95 -PYTHONPATH=%i/$PYTHON_LIB_SITE_PACKAGES:$PYTHONPATH python setup.py install --prefix=%i +PYTHONPATH=%i/${PYTHON_LIB_SITE_PACKAGES}:$PYTHONPATH python setup.py install --prefix=%i sed -ideleteme 's|#!.*/bin/python|#!/usr/bin/env python|' \ %{i}/bin/f2py \ %{i}/lib/python*/site-packages/numpy-*/EGG-INFO/scripts/f2py \ diff --git a/py2-ordereddict.spec b/py2-ordereddict.spec index 40074137564..307d7941dbf 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ordereddict diff --git a/py2-packaging.spec b/py2-packaging.spec index 082a6dd067d..9d5c6251c67 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name packaging diff --git a/py2-pandas.spec b/py2-pandas.spec index aaed512fc31..b55d56f0501 100644 --- a/py2-pandas.spec +++ b/py2-pandas.spec @@ -1,5 +1,5 @@ ### RPM external py2-pandas 0.19.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{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 f781f025cf9..16102888ebf 100644 --- a/py2-pandocfilters.spec +++ b/py2-pandocfilters.spec @@ -1,5 +1,5 @@ ### RPM external py2-pandocfilters 1.4.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pandocfilters diff --git a/py2-parsimonious.spec b/py2-parsimonious.spec index 9c357a5ff85..69175d7db3c 100644 --- a/py2-parsimonious.spec +++ b/py2-parsimonious.spec @@ -1,5 +1,5 @@ ### RPM external py2-parsimonious 0.7.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name parsimonious diff --git a/py2-pathlib2.spec b/py2-pathlib2.spec index fcba01f2a3c..55f7bf9c440 100644 --- a/py2-pathlib2.spec +++ b/py2-pathlib2.spec @@ -1,5 +1,5 @@ ### RPM external py2-pathlib2 2.2.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pathlib2 diff --git a/py2-pbr.spec b/py2-pbr.spec index 2517e07f44f..37fdfccaf26 100644 --- a/py2-pbr.spec +++ b/py2-pbr.spec @@ -1,5 +1,5 @@ ### RPM external py2-pbr 1.10.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pbr diff --git a/py2-pexpect.spec b/py2-pexpect.spec index 7705e736fc8..a17a9e368e6 100644 --- a/py2-pexpect.spec +++ b/py2-pexpect.spec @@ -1,5 +1,5 @@ ### RPM external py2-pexpect 4.2.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pexpect diff --git a/py2-pickleshare.spec b/py2-pickleshare.spec index 12cdf751a90..d4861685d87 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pickleshare diff --git a/py2-pip.spec b/py2-pip.spec index 19550ae5386..f7ede44b1b5 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 PYTHONPATH %{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.spec b/py2-pippkgs.spec index 544fc8c4ecc..96a93ea786c 100644 --- a/py2-pippkgs.spec +++ b/py2-pippkgs.spec @@ -1,5 +1,5 @@ ### RPM external py2-pippkgs 5.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: none Requires: root curl python @@ -86,13 +86,13 @@ BuildRequires: py2-pysqlite %build %install -mkdir -p %{i}/$PYTHON_LIB_SITE_PACKAGES +mkdir -p %{i}/${PYTHON_LIB_SITE_PACKAGES} for pkg in %builddirectpkgreqs ; do - SOURCE=%{cmsroot}/%{cmsplatf}/${pkg}/$PYTHON_LIB_SITE_PACKAGES + SOURCE=%{cmsroot}/%{cmsplatf}/${pkg}/${PYTHON_LIB_SITE_PACKAGES} if [ -d $SOURCE ] ; then echo "Checking for duplicates ...." for f in $(ls $SOURCE) ; do - if [ -e %{i}/$PYTHON_LIB_SITE_PACKAGES/$f ] ; then + if [ -e %{i}/${PYTHON_LIB_SITE_PACKAGES}/$f ] ; then # https://github.com/jupyter/jupyter_core/issues/55 - now I delete jupyter.py from one of the providers #backports is an example directory that can have multiple packages inside if [ $f != "backports" ] ; then @@ -103,7 +103,7 @@ for pkg in %builddirectpkgreqs ; do fi done echo "Copying $SOURCE in %{pkgrel}" - rsync -av $SOURCE/ %{i}/$PYTHON_LIB_SITE_PACKAGES/ + rsync -av $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/ fi done diff --git a/py2-pippkgs_depscipy.spec b/py2-pippkgs_depscipy.spec index 881efd88199..e67099b4b44 100644 --- a/py2-pippkgs_depscipy.spec +++ b/py2-pippkgs_depscipy.spec @@ -1,8 +1,8 @@ ### RPM external py2-pippkgs_depscipy 3.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: none -Requires: root curl python py2-pippkgs +Requires: root curl python py2-pippkgs py2-numpy py2-matplotlib %define isslc7 %(case %{cmsplatf} in (slc7_amd64*) echo 1 ;; (*) echo 0 ;; esac) @@ -28,13 +28,13 @@ BuildRequires: py2-root_numpy %build %install -mkdir -p %{i}/$PYTHON_LIB_SITE_PACKAGES +mkdir -p %{i}/${PYTHON_LIB_SITE_PACKAGES} for pkg in %builddirectpkgreqs ; do - SOURCE=%{cmsroot}/%{cmsplatf}/${pkg}/$PYTHON_LIB_SITE_PACKAGES + SOURCE=%{cmsroot}/%{cmsplatf}/${pkg}/${PYTHON_LIB_SITE_PACKAGES} if [ -d $SOURCE ] ; then echo "Checking for duplicates ...." for f in $(ls $SOURCE) ; do - if [ -e %{i}/$PYTHON_LIB_SITE_PACKAGES/$f ] ; then + if [ -e %{i}/${PYTHON_LIB_SITE_PACKAGES}/$f ] ; then # https://github.com/jupyter/jupyter_core/issues/55 - now I delete jupyter.py from one of the providers #backports is an example directory that can have multiple packages inside if [ $f != "backports" ] ; then @@ -45,7 +45,7 @@ for pkg in %builddirectpkgreqs ; do fi done echo "Copying $SOURCE in %{pkgrel}" - rsync -av $SOURCE/ %{i}/$PYTHON_LIB_SITE_PACKAGES/ + rsync -av $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/ fi done diff --git a/py2-pkgconfig.spec b/py2-pkgconfig.spec index 40087c669e4..131ae1af74e 100644 --- a/py2-pkgconfig.spec +++ b/py2-pkgconfig.spec @@ -1,5 +1,5 @@ ### RPM external py2-pkgconfig 1.2.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pkgconfig diff --git a/py2-prettytable.spec b/py2-prettytable.spec index c2ee8775cd8..55404e9b38d 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name prettytable diff --git a/py2-prompt_toolkit.spec b/py2-prompt_toolkit.spec index 58c9d51a62f..39bc2cc4835 100644 --- a/py2-prompt_toolkit.spec +++ b/py2-prompt_toolkit.spec @@ -1,5 +1,5 @@ ### RPM external py2-prompt_toolkit 1.0.10 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name prompt_toolkit diff --git a/py2-protobuf.spec b/py2-protobuf.spec index 74bf6da9f2a..b936bb2ed51 100644 --- a/py2-protobuf.spec +++ b/py2-protobuf.spec @@ -1,5 +1,5 @@ ### RPM external py2-protobuf 3.2.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name protobuf diff --git a/py2-psutil.spec b/py2-psutil.spec index e13038573fa..7ab11556efb 100644 --- a/py2-psutil.spec +++ b/py2-psutil.spec @@ -1,5 +1,5 @@ ### RPM external py2-psutil 5.0.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-ptyprocess.spec b/py2-ptyprocess.spec index ca6d208bbdf..52d65e0eb40 100644 --- a/py2-ptyprocess.spec +++ b/py2-ptyprocess.spec @@ -1,5 +1,5 @@ ### RPM external py2-ptyprocess 0.5.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name ptyprocess diff --git a/py2-pycurl.spec b/py2-pycurl.spec index ad41cfab5ce..973b71e574b 100644 --- a/py2-pycurl.spec +++ b/py2-pycurl.spec @@ -1,5 +1,5 @@ ### RPM external py2-pycurl 7.43.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipBuildOptions --global-option="--with-openssl" --global-option="--openssl-dir=${OPENSSL_ROOT}" diff --git a/py2-pygithub.spec b/py2-pygithub.spec index c6686527300..84867618aeb 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 PYTHONPATH %{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 c9059e924ee..8289733c3ef 100644 --- a/py2-pyparsing.spec +++ b/py2-pyparsing.spec @@ -1,5 +1,5 @@ ### RPM external py2-pyparsing 2.1.10 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pyparsing diff --git a/py2-pysqlite.spec b/py2-pysqlite.spec index 5e91c0a1ab8..8ad0c6f9943 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pysqlite diff --git a/py2-python-dateutil.spec b/py2-python-dateutil.spec index 87913a59ed9..56671492448 100644 --- a/py2-python-dateutil.spec +++ b/py2-python-dateutil.spec @@ -1,4 +1,4 @@ ### RPM external py2-python-dateutil 1.5 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## IMPORT build-with-pip diff --git a/py2-pytz.spec b/py2-pytz.spec index a07d5736170..8830b08dcdb 100644 --- a/py2-pytz.spec +++ b/py2-pytz.spec @@ -1,5 +1,5 @@ ### RPM external py2-pytz 2016.10 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pytz diff --git a/py2-pyxml.spec b/py2-pyxml.spec index a2c0ddb6b80..20b73b82295 100644 --- a/py2-pyxml.spec +++ b/py2-pyxml.spec @@ -1,5 +1,5 @@ ### RPM external py2-pyxml 0.8.4 -## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES +## 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 diff --git a/py2-pyzmq.spec b/py2-pyzmq.spec index 224f14696cb..e66861bccb6 100644 --- a/py2-pyzmq.spec +++ b/py2-pyzmq.spec @@ -1,5 +1,5 @@ ### RPM external py2-pyzmq 16.0.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name pyzmq diff --git a/py2-qtconsole.spec b/py2-qtconsole.spec index dfc30b0894d..b226e6188bd 100644 --- a/py2-qtconsole.spec +++ b/py2-qtconsole.spec @@ -1,5 +1,5 @@ ### RPM external py2-qtconsole 4.2.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name qtconsole diff --git a/py2-repozelru.spec b/py2-repozelru.spec index dc42862721a..5a38755cb57 100644 --- a/py2-repozelru.spec +++ b/py2-repozelru.spec @@ -1,5 +1,5 @@ ### RPM external py2-repozelru 0.6 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name repoze.lru diff --git a/py2-requests.spec b/py2-requests.spec index 2c23ae25fe8..ab22ac9c5e5 100644 --- a/py2-requests.spec +++ b/py2-requests.spec @@ -1,5 +1,5 @@ ### RPM external py2-requests 2.13.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name requests diff --git a/py2-root_numpy.spec b/py2-root_numpy.spec index cd5ae9c4fa8..4dbea0cfd55 100644 --- a/py2-root_numpy.spec +++ b/py2-root_numpy.spec @@ -1,5 +1,5 @@ ### RPM external py2-root_numpy 4.7.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name root_numpy diff --git a/py2-rootpy.spec b/py2-rootpy.spec index fd6a10bc3b8..edf07102107 100644 --- a/py2-rootpy.spec +++ b/py2-rootpy.spec @@ -1,5 +1,5 @@ ### RPM external py2-rootpy 0.8.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipPostBuild \ diff --git a/py2-scandir.spec b/py2-scandir.spec index bb3e0f3c196..379a936e418 100644 --- a/py2-scandir.spec +++ b/py2-scandir.spec @@ -1,5 +1,5 @@ ### RPM external py2-scandir 1.4 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name scandir diff --git a/py2-schema.spec b/py2-schema.spec index ba10746c7c5..29880155a6f 100644 --- a/py2-schema.spec +++ b/py2-schema.spec @@ -1,5 +1,5 @@ ### RPM external py2-schema 0.6.5 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name schema diff --git a/py2-scikit-learn.spec b/py2-scikit-learn.spec index 6bf0c5fecde..ca6fcaa3c43 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 PYTHONPATH %{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 344878a0621..ab24ca2d9ab 100644 --- a/py2-scipy.spec +++ b/py2-scipy.spec @@ -1,5 +1,5 @@ ### RPM external py2-scipy 0.19.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name scipy Requires: py2-numpy diff --git a/py2-setuptools.spec b/py2-setuptools.spec index cfa8ca4cf85..b62631052c6 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 PYTHONPATH %{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 2a229e4cacb..c62f030ce3b 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name backports.shutil_get_terminal_size diff --git a/py2-simplegeneric.spec b/py2-simplegeneric.spec index 97b03610300..b2e865c51a8 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name simplegeneric diff --git a/py2-singledispatch.spec b/py2-singledispatch.spec index 9213254eca8..df6f755754b 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name singledispatch diff --git a/py2-six.spec b/py2-six.spec index c289525c6fe..83f8045fbef 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 PYTHONPATH %{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.spec b/py2-sqlalchemy.spec index ae9a7d736e0..0f419b3930d 100644 --- a/py2-sqlalchemy.spec +++ b/py2-sqlalchemy.spec @@ -1,5 +1,5 @@ ### RPM external py2-sqlalchemy 1.1.4 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Source: https://pypi.python.org/packages/ca/ca/c2436fdb7bb75d772d9fa17ba60c4cfded6284eed053a7274b2beb96596a/SQLAlchemy-%{realversion}.tar.gz Requires: python py2-setuptools @@ -16,6 +16,6 @@ Patch1: py2-sqlalchemy-1.1.4-fix-sqlite-dialect-timestamp python setup.py build %install -mkdir -p %{i}/$PYTHON_LIB_SITE_PACKAGES -PYTHONPATH=%{i}/$PYTHON_LIB_SITE_PACKAGES:${PYTHONPATH} python setup.py install --skip-build --prefix=%{i} +mkdir -p %{i}/${PYTHON_LIB_SITE_PACKAGES} +PYTHONPATH=%{i}/${PYTHON_LIB_SITE_PACKAGES}:${PYTHONPATH} python setup.py install --skip-build --prefix=%{i} diff --git a/py2-sympy.spec b/py2-sympy.spec index df79ae6c0c5..d97b65fb623 100644 --- a/py2-sympy.spec +++ b/py2-sympy.spec @@ -1,5 +1,5 @@ ### RPM external py2-sympy 1.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{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 0c1b0364153..4097f33ad38 100644 --- a/py2-tables.spec +++ b/py2-tables.spec @@ -1,5 +1,5 @@ ### RPM external py2-tables 3.3.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} Patch0: py2-tables-fix-for-aarch64 %define pip_name tables Requires: py2-numexpr py2-six py2-numpy hdf5 bz2lib diff --git a/py2-tensorflow.spec b/py2-tensorflow.spec index 1155b45e3a8..d457a63785a 100644 --- a/py2-tensorflow.spec +++ b/py2-tensorflow.spec @@ -1,5 +1,5 @@ ### RPM external py2-tensorflow 1.0.0 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} # nothing on pypi is ok for tensorflow at this point %define tensorflowSource https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.0-cp27-none-linux_x86_64.whl diff --git a/py2-terminado.spec b/py2-terminado.spec index 7b29a4ccfb8..053df869ded 100644 --- a/py2-terminado.spec +++ b/py2-terminado.spec @@ -1,5 +1,5 @@ ### RPM external py2-terminado 0.6 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name terminado diff --git a/py2-testpath.spec b/py2-testpath.spec index b9cc1478282..57bce6e3e8d 100644 --- a/py2-testpath.spec +++ b/py2-testpath.spec @@ -1,5 +1,5 @@ ### RPM external py2-testpath 0.3 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define PipDownloadOptions --no-deps%%20--no-binary%%3D:none: %define pip_name testpath diff --git a/py2-tornado.spec b/py2-tornado.spec index f39c568b8de..0f549f13770 100644 --- a/py2-tornado.spec +++ b/py2-tornado.spec @@ -1,5 +1,5 @@ ### RPM external py2-tornado 4.4.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name tornado diff --git a/py2-tqdm.spec b/py2-tqdm.spec index 9833da1d7cd..072fe946f9d 100644 --- a/py2-tqdm.spec +++ b/py2-tqdm.spec @@ -1,5 +1,5 @@ ### RPM external py2-tqdm 4.11.2 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name tqdm diff --git a/py2-traitlets.spec b/py2-traitlets.spec index ee2983fb45d..7dcd15a4518 100644 --- a/py2-traitlets.spec +++ b/py2-traitlets.spec @@ -1,5 +1,5 @@ ### RPM external py2-traitlets 4.3.1 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name traitlets diff --git a/py2-wcwidth.spec b/py2-wcwidth.spec index e1b82fc21ff..a1896e5a505 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 PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name wcwidth diff --git a/py2-webencodings.spec b/py2-webencodings.spec index 24d89564e9d..7b4b22df51d 100644 --- a/py2-webencodings.spec +++ b/py2-webencodings.spec @@ -1,5 +1,5 @@ ### RPM external py2-webencodings 0.5 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name webencodings diff --git a/py2-widgetsnbextension.spec b/py2-widgetsnbextension.spec index 224129fd55f..c1724d2e40a 100644 --- a/py2-widgetsnbextension.spec +++ b/py2-widgetsnbextension.spec @@ -1,5 +1,5 @@ ### RPM external py2-widgetsnbextension 1.2.6 -## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES +## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} %define pip_name widgetsnbextension