[openstack-heat/el6-icehouse] Drop parallel python packages

[Jeff Peeler]

commit 27a1d4527af6ee75eaedd4ffa09191e346572c0d
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon May 5 16:38:29 2014 -0400

    Drop parallel python packages

 openstack-heat.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/openstack-heat.spec b/openstack-heat.spec
index f61935b..161e709 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -8,7 +8,7 @@
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
 Version:	2014.1
-Release:	1.0%{?dist}
+Release:	1.1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -28,7 +28,6 @@ Source20:   heat-dist.conf
 #
 Patch0001: 0001-Switch-to-using-M2Crypto.patch
 Patch0002: 0002-remove-pbr-runtime-dependency.patch
-Patch0003: 0003-Adjust-to-handle-parallel-installed-packages.patch
 Patch0004: 0004-Patch-to-allow-building-against-python-oslo-sphinx.patch
 
 BuildArch: noarch
@@ -51,12 +50,12 @@ BuildRequires: python-six
 BuildRequires: PyYAML
 BuildRequires: m2crypto
 BuildRequires: python-paramiko
-BuildRequires: python-sphinx10
+BuildRequires: python-sphinx >= 1.1.2
 # These are required to build due to the requirements check added
-BuildRequires: python-paste-deploy1.5
-BuildRequires: python-routes1.12
-BuildRequires: python-sqlalchemy0.7
-BuildRequires: python-webob1.2
+BuildRequires: python-paste-deploy >= 1.5.0
+BuildRequires: python-routes >= 1.12
+BuildRequires: python-sqlalchemy >= 0.7.8
+BuildRequires: python-webob >= 1.2.3
 
 BuildRequires: python-pbr
 BuildRequires: python-d2to1
@@ -81,7 +80,6 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 %patch0004 -p1
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py
@@ -132,8 +130,8 @@ mkdir -p %{buildroot}/etc/heat/
 %if 0%{?with_doc}
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 pushd doc
-sphinx-1.0-build -b html -d build/doctrees source build/html
-sphinx-1.0-build -b man -d build/doctrees source build/man
+sphinx-build -b html -d build/doctrees source build/html
+sphinx-build -b man -d build/doctrees source build/man
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/
@@ -389,6 +387,9 @@ fi
 
 
 %changelog
+* Mon May  5 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1-1.1
+- Drop parallel packages
+
 * Tue Apr 22 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1-1.0
 - update to icehouse final