[python-cliff/epel7] Revert "Latest upstream with python3 subpackage."

[Alan Pevec]

commit dae4ac31117b1513fc95bd052c36b8fe5b62c652
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Feb 4 15:55:56 2014 +0100

    Revert "Latest upstream with python3 subpackage."
    
    to avoid dependency cascade:
     cliff >= 1.4.5 -> cmd2 >= 0.6.7 -> pyparsing >= 2.0.1
     while el7 beta has pyparsing-1.5.6-8.el7 [1]
    
    [1] https://fedoraproject.org/wiki/EPEL/epel7
    
    This reverts commit 2dfce2adb45df2592b750d595da8e78ec2549dde.

 .gitignore                                     |    1 -
 python-cliff-loosen-pyparsing-constraint.patch |   25 ++++++++++++++++++++
 python-cliff.spec                              |   30 ++++++++++++-----------
 sources                                        |    2 +-
 4 files changed, 42 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aa58b2a..8427b47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 /cliff-1.3.2.tar.gz
 /cliff-1.4.tar.gz
 /cliff-1.4.4.tar.gz
-/cliff-1.4.5.tar.gz
diff --git a/python-cliff-loosen-pyparsing-constraint.patch b/python-cliff-loosen-pyparsing-constraint.patch
new file mode 100644
index 0000000..adfbc7e
--- /dev/null
+++ b/python-cliff-loosen-pyparsing-constraint.patch
@@ -0,0 +1,25 @@
+From b760c7214df9e772938a90f31a80fc3531b0d861 Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean at redhat.com>
+Date: Wed, 10 Apr 2013 16:37:01 -0400
+Subject: [PATCH] loosen pyparsing constraint
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c126dcd..b12665c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -32,7 +32,7 @@ install_requires = [
+ # there is a release declare the dependency ourselves.
+ # http://trac-hg.assembla.com/python-cmd2/rev/a5f3d5a89d6c
+ if sys.version_info[0] < 3:
+-    install_requires.append('pyparsing==1.5.7')
++    install_requires.append('pyparsing<=1.5.7')
+ else:
+     install_requires.append('pyparsing>=2.0.0')
+ 
+-- 
+1.8.1.4
+
diff --git a/python-cliff.spec b/python-cliff.spec
index 9b74f1a..c59cc9f 100644
--- a/python-cliff.spec
+++ b/python-cliff.spec
@@ -1,11 +1,13 @@
 %if 0%{?fedora}
-%global with_python3 1
+# This is disabled until python3-pyparsing-2.0 or later is available.
+# https://bugzilla.redhat.com/show_bug.cgi?id=950775
+%global with_python3 0
 %endif
 
 %global modname cliff
 
 Name:             python-cliff
-Version:          1.4.5
+Version:          1.4.4
 Release:          1%{?dist}
 Summary:          Command Line Interface Formulation Framework
 
@@ -13,16 +15,17 @@ Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://pypi.python.org/pypi/cliff
 Source0:          http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz
+Patch0:           python-cliff-loosen-pyparsing-constraint.patch
 
 BuildArch:        noarch
 
 BuildRequires:    python2-devel
 BuildRequires:    python-setuptools
 BuildRequires:    python-prettytable
-BuildRequires:    python-cmd2 >= 0.6.7
+BuildRequires:    python-cmd2
 Requires:         python-setuptools
 Requires:         python-prettytable
-Requires:         python-cmd2 >= 0.6.7
+Requires:         python-cmd2
 
 %if %{?rhel}%{!?rhel:0} == 6
 BuildRequires:    python-argparse
@@ -34,7 +37,10 @@ Requires:         python-argparse
 BuildRequires:    python3-devel
 BuildRequires:    python3-setuptools
 BuildRequires:    python3-prettytable
-BuildRequires:    python3-cmd2 >= 0.6.7
+BuildRequires:    python3-cmd2
+
+# This is actually a dep of python3-cmd2, but we need a certain version.
+BuildRequires:    python3-pyparsing>=2.0.0
 %endif
 
 %description
@@ -52,7 +58,10 @@ Group:          Development/Libraries
 
 Requires:         python3-setuptools
 Requires:         python3-prettytable
-Requires:         python3-cmd2 >= 0.6.7
+Requires:         python3-cmd2
+
+# This is actually a dep of python3-cmd2, but we need a certain version.
+Requires:         python3-pyparsing>=2.0.0
 
 %description -n python3-cliff
 cliff is a framework for building command line programs. It uses setuptools
@@ -65,6 +74,7 @@ http://readthedocs.org/docs/cliff/en/latest/
 
 %prep
 %setup -q -n %{modname}-%{version}
+%patch0 -p1 -b .pyparsing
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -116,14 +126,6 @@ popd
 
 
 %changelog
-* Thu Nov 14 2013 Ralph Bean <rbean at redhat.com> - 1.4.5-1
-- Latest upstream.
-- Remove patch now that the latest cmd2 and pyparsing are required.
-
-* Thu Nov 14 2013 Ralph Bean <rbean at redhat.com> - 1.4.4-2
-- Enable python3 subpackage now that python3-pyparsing is available.
-- Adjust patch to simplify pyparsing setuptools constraints further.
-
 * Fri Sep 13 2013 Pádraig Brady <pbrady at redhat.com> - 1.4.4-1
 - Latest upstream.
 
diff --git a/sources b/sources
index 02ad105..0d84ae5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21743e9e800cf526e88e420f366a4c5c  cliff-1.4.5.tar.gz
+1b74a2d4e7b0b46fae30c27488ec2448  cliff-1.4.4.tar.gz