[openstack-tripleo] Use stable/icehouse branch

[slagle]

commit ce3e4b445a1974956dc169c7f057f66e76a5ad98
Author: James Slagle <jslagle at redhat.com>
Date:   Tue Apr 15 09:48:27 2014 -0400

    Use stable/icehouse branch

 .gitignore                              |    1 +
 0001-Add-shebang.patch                  |   23 ------------
 0004-Default-devtest_variables.sh.patch |   60 -------------------------------
 openstack-tripleo.spec                  |   23 +++++-------
 sources                                 |    2 +-
 5 files changed, 12 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9e8e54..4e46088 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /d305ad25f2538d829465092146de5cdfb4a803d8.tar.gz
+/icehouse.tar.gz
diff --git a/openstack-tripleo.spec b/openstack-tripleo.spec
index f94e064..c189726 100644
--- a/openstack-tripleo.spec
+++ b/openstack-tripleo.spec
@@ -1,11 +1,11 @@
-%global commit d305ad25f2538d829465092146de5cdfb4a803d8
+%global commit stable/icehouse
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global alphatag 20140220git
+%global alphatag icehouse
 %global repo_name tripleo-incubator
 
 Name:			openstack-tripleo
 Version:		0.0.2
-Release:		5.%{alphatag}%{?dist}
+Release:		6.%{alphatag}%{?dist}
 Summary:		OpenStack TripleO
 
 Group:			Applications/System
@@ -14,13 +14,10 @@ URL:			https://wiki.openstack.org/wiki/TripleO
 Source0:		https://github.com/openstack/%{repo_name}/archive/%{commit}.tar.gz
 Source1:		tripleo
 
-# Upstream patch: https://review.openstack.org/#/c/74452/
-Patch0001:		0001-Add-shebang.patch
 # Upstream switched to oslosphinx in https://review.openstack.org/#/c/73353/,
 # but that does not yet exist in Fedora.
 Patch0002:		0002-Switch-back-to-oslo.sphinx.patch
 Patch0003:		0003-Use-packaged-template-directory.patch
-Patch0004:		0004-Default-devtest_variables.sh.patch
 
 # https://review.openstack.org/#/c/85024/
 Patch0005:		0005-Move-setup-clienttools-to-devtest_setup.sh.patch
@@ -30,6 +27,8 @@ BuildArch:		noarch
 BuildRequires:		python-sphinx
 BuildRequires:		python-oslo-sphinx
 
+Requires:		jq
+
 %description
 TripleO is a program aimed at installing, upgrading and operating OpenStack
 clouds using OpenStack's own cloud facilities as the foundations - building on
@@ -53,12 +52,10 @@ nova, neutron and heat to automate fleet management at datacenter scale.
 This package contains documentation files for TripleO.
 
 %prep
-%setup -q -n %{repo_name}-%{commit}
+%setup -q -n %{repo_name}-stable-%{alphatag}
 
-%patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
 %patch0005 -p1
 
 %install
@@ -83,10 +80,6 @@ install -p -m 644 -t %{buildroot}/%{_sysconfdir}/tripleo overcloudrc-user
 install -d -m 755 %{buildroot}/%{_datadir}/tripleo/templates
 install -p -m 644 -t %{buildroot}/%{_datadir}/tripleo/templates templates/*
 
-# libvirt templates
-install -d -m 755 %{buildroot}/%{_datadir}/tripleo/libvirt-templates
-install -p -m 644 -t %{buildroot}/%{_datadir}/tripleo/libvirt-templates libvirt-templates/*
-
 # documentation
 sphinx-build -b html doc/source doc/build/html
 install -d -m 755 %{buildroot}%{_datadir}/doc/tripleo/html
@@ -106,6 +99,10 @@ cp -r doc/build/html/* %{buildroot}%{_datadir}/doc/tripleo/html
 %{_datadir}/doc/tripleo
 
 %changelog
+* Tue Apr 15 2014 James Slagle <jslagle at redhat.com> 0.0.2-6.icehouse
+- Build from upstream stable/icehouse branch
+- Add Requires on jq
+
 * Fri Apr 04 2014 James Slagle <jslagle at redhat.com> 0.0.2-5.20140220git
 - Add patch 0005-Move-setup-clienttools-to-devtest_setup.sh.patch
 
diff --git a/sources b/sources
index fb0003b..4055383 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0db0cc8368dfd2332d5d572b8c7b2cc6  d305ad25f2538d829465092146de5cdfb4a803d8.tar.gz
+48f128464f7895f481a42ccdc98e5728  icehouse.tar.gz