From f876aa6711e03632b8bcf68378e7a83b3279675a Mon Sep 17 00:00:00 2001
From: Bruno Cornec <bruno@victoria.frmug.org>
Date: Mon, 4 Apr 2016 19:35:03 +0200
Subject: [PATCH] New version of PR #38

- Put back python funny syntax in requirements.txt
- Create a PB macro (for now in all.pbf) to alter the requirements.txt
  to remove the funny python syntax
---
 pbconf/pbfilter/all.pbf                       | 1 +
 pbconf/python-redfish/rpm/python-redfish.spec | 2 ++
 requirements.txt                              | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pbconf/pbfilter/all.pbf b/pbconf/pbfilter/all.pbf
index 8e9647e..45f42d8 100644
--- a/pbconf/pbfilter/all.pbf
+++ b/pbconf/pbfilter/all.pbf
@@ -69,3 +69,4 @@ filter PBLOG = yes
 
 filter PBCONFFILE = /etc/redfish-client.conf
 filter PBTEMPLATEPATH = /usr/share/redfish-client/templates
+filter PBPYTHON3FILTER = perl -pi -e "s|configparser>=3.3.0; python_version < '3'|configparser>=3.3.0|" requirements.txt
diff --git a/pbconf/python-redfish/rpm/python-redfish.spec b/pbconf/python-redfish/rpm/python-redfish.spec
index 6011042..0307058 100644
--- a/pbconf/python-redfish/rpm/python-redfish.spec
+++ b/pbconf/python-redfish/rpm/python-redfish.spec
@@ -22,6 +22,8 @@ PBDESC
 %setup -q
 
 %build
+# Fix for now as long as setuptools isn't more recent in distributions
+PBPYTHON3FILTER
 %{__python} setup.py build
 
 # Build minimal documentation
diff --git a/requirements.txt b/requirements.txt
index d38b06a..8130bed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,4 +12,4 @@ requests>=2.9.1
 
 # Python3 compat
 future>=0.15.2
-#configparser>=3.3.0; python_version < '3'
+configparser>=3.3.0; python_version < '3'