From 0cc75168733490063002fa2e50a21219db50dd25 Mon Sep 17 00:00:00 2001
From: ijaz <ijazahmad722@gmail.com>
Date: Tue, 30 Aug 2016 16:34:26 +0200
Subject: [PATCH 1/4] adds cycler for matplotlib

---
 py2-cycler-toolfile.spec | 23 +++++++++++++++++++++++
 py2-cycler.spec          | 17 +++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 py2-cycler-toolfile.spec
 create mode 100644 py2-cycler.spec

diff --git a/py2-cycler-toolfile.spec b/py2-cycler-toolfile.spec
new file mode 100644
index 00000000000..2c6d547d74f
--- /dev/null
+++ b/py2-cycler-toolfile.spec
@@ -0,0 +1,23 @@
+### RPM external py2-cycler-toolfile 1.0
+Requires: py2-cycler
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-cycler.xml
+<tool name="py2-cycler" version="@TOOL_VERSION@">
+  <info url="https://github.com/matplotlib/cycler"/>
+  <client>
+    <environment name="PY2_CYCLER" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$PY2_CYCLER/lib"/>
+    <runtime name="PYTHONPATH" value="$PY2_CYCLER/lib/python@PYTHONV@/site-packages" type="path"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post
diff --git a/py2-cycler.spec b/py2-cycler.spec
new file mode 100644
index 00000000000..5c7309158c8
--- /dev/null
+++ b/py2-cycler.spec
@@ -0,0 +1,17 @@
+### RPM external py2-cycler 0.10.0
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+%define my_name %(echo %n | cut -f2 -d-)
+Source: https://github.com/matplotlib/cycler/%my_name/archive/v%{realversion}.tar.gz
+
+Requires: python
+BuildRequires: py2-setuptools
+
+%prep
+%setup -n %{my_name}-%{realversion}
+
+%build
+python setup.py build
+
+%install
+python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
+find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -print0 | xargs -0 rm -rf

From 097546ad8e292b3a267b761a9557f69d45744d26 Mon Sep 17 00:00:00 2001
From: ijaz <ijazahmad722@gmail.com>
Date: Tue, 30 Aug 2016 16:40:31 +0200
Subject: [PATCH 2/4] adds py2-cycler-toolfile to cmssw-toolconf

---
 cmssw-tool-conf.spec | 1 +
 py2-cycler.spec      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
index 365b9bf14d2..784f997ad9b 100644
--- a/cmssw-tool-conf.spec
+++ b/cmssw-tool-conf.spec
@@ -156,6 +156,7 @@ Requires: libxslt-toolfile
 Requires: py2-six-toolfile
 Requires: py2-pyparsing-toolfile
 Requires: py2-requests-toolfile
+Requires: py2-cycler-toolfile
 Requires: giflib-toolfile
 Requires: freetype-toolfile
 Requires: utm-toolfile
diff --git a/py2-cycler.spec b/py2-cycler.spec
index 5c7309158c8..22fa8227a3d 100644
--- a/py2-cycler.spec
+++ b/py2-cycler.spec
@@ -1,7 +1,7 @@
 ### RPM external py2-cycler 0.10.0
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 %define my_name %(echo %n | cut -f2 -d-)
-Source: https://github.com/matplotlib/cycler/%my_name/archive/v%{realversion}.tar.gz
+Source: https://github.com/matplotlib/%my_name/archive/v%{realversion}.tar.gz
 
 Requires: python
 BuildRequires: py2-setuptools

From aad580075d058f500feafddb888eaf5315f0fdec Mon Sep 17 00:00:00 2001
From: ijaz <ijazahmad722@gmail.com>
Date: Tue, 30 Aug 2016 16:48:31 +0200
Subject: [PATCH 3/4] adds cycler to matplotlib

---
 py2-matplotlib.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py2-matplotlib.spec b/py2-matplotlib.spec
index 0aabd8dbff1..b428c52659b 100644
--- a/py2-matplotlib.spec
+++ b/py2-matplotlib.spec
@@ -1,7 +1,7 @@
 ### RPM external py2-matplotlib 1.5.2
 ## INITENV +PATH PYTHONPATH %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
+Requires: py2-pytz py2-numpy py2-python-dateutil zlib libpng freetype py2-pyparsing py2-six py2-cycler
 BuildRequires: py2-setuptools
 
 %prep

From 2bc76344ad391cc275633e6246ff933a4189cd73 Mon Sep 17 00:00:00 2001
From: ijaz <ijazahmad722@gmail.com>
Date: Tue, 30 Aug 2016 17:11:00 +0200
Subject: [PATCH 4/4] updates matplotlib toolfile to use cycler

---
 py2-matplotlib-toolfile.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py2-matplotlib-toolfile.spec b/py2-matplotlib-toolfile.spec
index 16b0eb42999..302409d506b 100644
--- a/py2-matplotlib-toolfile.spec
+++ b/py2-matplotlib-toolfile.spec
@@ -18,6 +18,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/py2-matplotlib.xml
   <use name="libpng"/>
   <use name="py2-numpy"/>
   <use name="py2-python-dateutil"/>
+  <use name="py2-cycler"/>
 </tool>
 EOF_TOOLFILE