[openshift-origin-broker] Fix parseconfig version dependancy (#884860)

[tdawson]

commit acdb801ddb5c915386136b47292bf956d4691b77
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Dec 10 10:34:00 2012 -0600

    Fix parseconfig version dependancy (#884860)

 ...origin-broker-0.6.17-gemfile-dependancies.patch |    8 +++++---
 openshift-origin-broker.spec                       |    8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/openshift-origin-broker-0.6.17-gemfile-dependancies.patch b/openshift-origin-broker-0.6.17-gemfile-dependancies.patch
index 5c5404b..e1d0917 100644
--- a/openshift-origin-broker-0.6.17-gemfile-dependancies.patch
+++ b/openshift-origin-broker-0.6.17-gemfile-dependancies.patch
@@ -1,12 +1,14 @@
---- openshift-origin-broker-0.6.17.orig/Gemfile	2012-11-21 11:33:04.023098232 -0600
-+++ openshift-origin-broker-0.6.17/Gemfile	2012-11-21 11:33:40.897099032 -0600
+diff -ur openshift-origin-broker-0.6.17.orig/Gemfile openshift-origin-broker-0.6.17/Gemfile
+--- openshift-origin-broker-0.6.17.orig/Gemfile	2012-10-22 16:43:07.000000000 -0500
++++ openshift-origin-broker-0.6.17/Gemfile	2012-12-10 10:24:52.229062277 -0600
 @@ -1,12 +1,11 @@
  source 'http://rubygems.org'
  
 -gem 'rails', '~> 3.0.13'
 +gem 'rails'
  gem 'json'
- gem 'parseconfig', '0.5.2'
+-gem 'parseconfig', '0.5.2'
++gem 'parseconfig'
  gem 'mongo'
  gem 'xml-simple'
  gem 'rack'
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index dabd447..6056155 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -10,7 +10,7 @@
 Summary:   OpenShift Origin broker components
 Name:      openshift-origin-broker
 Version:   0.6.17
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   ASL 2.0
 URL:       http://openshift.redhat.com
 Source0:   http://mirror.openshift.com/pub/openshift-origin/source/%{name}/openshift-origin-broker-%{version}.tar.gz
@@ -49,7 +49,9 @@ This includes the public APIs for the client tools.
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %patch2 -p1
+%endif
 
 %build
 
@@ -136,6 +138,10 @@ fi
 %endif
 
 %changelog
+* Mon Dec 10 2012 Troy Dawson <tdawson at redhat.com> 0.6.17-4
+- Fix parseconfig version dependancy (#884860)
+- httpd-2.4 patch only applied for F18+
+
 * Sat Nov 24 2012 Troy Dawson <tdawson at redhat.com> 0.6.17-3
 - Removed unnesessary dependancies