[openshift-origin-broker] update to 1.4.1
tdawson
tdawson at fedoraproject.org
Mon Feb 18 22:54:54 UTC 2013
commit 3823b7233d80e8df89cff9d97abf71c19d507e36
Author: Troy Dawson <tdawson at redhat.com>
Date: Mon Feb 18 16:54:45 2013 -0600
update to 1.4.1
.gitignore | 1 +
...-origin-broker-1.4.1-gemfile-dependancies.patch | 11 +-
openshift-origin-broker.spec | 151 +++++++++++++++-----
sources | 2 +-
4 files changed, 121 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ed186c..287bc9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/openshift-origin-broker-0.6.17.tar.gz
/openshift-origin-broker-1.1.1.tar.gz
/openshift-origin-broker-1.1.2.tar.gz
+/openshift-origin-broker-1.4.1.tar.gz
diff --git a/openshift-origin-broker-1.1.2-gemfile-dependancies.patch b/openshift-origin-broker-1.4.1-gemfile-dependancies.patch
similarity index 54%
rename from openshift-origin-broker-1.1.2-gemfile-dependancies.patch
rename to openshift-origin-broker-1.4.1-gemfile-dependancies.patch
index ed419c6..b2cc36f 100644
--- a/openshift-origin-broker-1.1.2-gemfile-dependancies.patch
+++ b/openshift-origin-broker-1.4.1-gemfile-dependancies.patch
@@ -1,6 +1,6 @@
-diff -ur openshift-origin-broker-1.1.2.orig/Gemfile openshift-origin-broker-1.1.2/Gemfile
---- openshift-origin-broker-1.1.2.orig/Gemfile 2013-01-26 09:30:03.000000000 -0600
-+++ openshift-origin-broker-1.1.2/Gemfile 2013-01-30 14:49:42.148000000 -0600
+diff -ur openshift-origin-broker-1.4.1.orig/Gemfile openshift-origin-broker-1.4.1/Gemfile
+--- openshift-origin-broker-1.4.1.orig/Gemfile 2013-02-15 09:30:04.000000000 -0600
++++ openshift-origin-broker-1.4.1/Gemfile 2013-02-18 16:21:39.525000000 -0600
@@ -1,8 +1,8 @@
source 'http://rubygems.org'
@@ -12,13 +12,14 @@ diff -ur openshift-origin-broker-1.1.2.orig/Gemfile openshift-origin-broker-1.1.
gem 'xml-simple'
gem 'rack'
gem 'regin'
-@@ -42,7 +42,7 @@
- # and rake tasks are available in development mode:
+@@ -49,8 +49,8 @@
group :development, :test do
# The require part from http://tinyurl.com/3pf68ho
+ gem 'rest-client', :require => 'rest-client'
- gem 'mocha', '0.12.1', :require => nil
- gem 'rake', '>= 0.8.7', '<= 0.9.2.2'
+ gem 'mocha'
+ gem 'rake'
+ gem 'simplecov'
gem 'cucumber'
end
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index 78704ee..e6186a6 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -1,5 +1,5 @@
-%global htmldir %{_localstatedir}/www/html
-%global brokerdir %{_localstatedir}/www/openshift/broker
+%global htmldir %{_var}/www/html
+%global brokerdir %{_var}/www/openshift/broker
%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
%global with_systemd 1
@@ -7,39 +7,39 @@
%global with_systemd 0
%endif
-Summary: OpenShift Origin broker components
-Name: openshift-origin-broker
-Version: 1.1.2
-Release: 1%{?dist}
-License: ASL 2.0
-URL: http://openshift.redhat.com
-Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
+Summary: OpenShift Origin broker components
+Name: openshift-origin-broker
+Version: 1.4.1
+Release: 1%{?dist}
+License: ASL 2.0
+URL: http://openshift.redhat.com
+Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
# Example blank favicon - upstream currently does not ship one
-Source1: %{name}.favicon
-Patch1: openshift-origin-broker-1.1.2-gemfile-dependancies.patch
-Requires: httpd
-Requires: bind
-Requires: mod_ssl
-Requires: mod_passenger
-Requires: mongodb-server
-Requires: policycoreutils-python
-Requires: rubygem(rails)
-Requires: rubygem(xml-simple)
-Requires: rubygem(bson_ext)
-Requires: rubygem(rest-client)
-Requires: rubygem(parseconfig)
-Requires: rubygem(json)
-Requires: rubygem(openshift-origin-controller)
-Requires: rubygem(passenger)
-Requires: rubygem(mocha)
-Requires: rubygem(cucumber)
-Requires: rubygem-passenger-native
+Source1: %{name}.favicon
+Patch1: openshift-origin-broker-1.4.1-gemfile-dependancies.patch
+Requires: httpd
+Requires: bind
+Requires: mod_ssl
+Requires: mod_passenger
+Requires: mongodb-server
+Requires: policycoreutils-python
+Requires: rubygem(rails)
+Requires: rubygem(xml-simple)
+Requires: rubygem(bson_ext)
+Requires: rubygem(rest-client)
+Requires: rubygem(parseconfig)
+Requires: rubygem(cucumber)
+Requires: rubygem(json)
+Requires: rubygem(openshift-origin-controller)
+Requires: rubygem(passenger)
+Requires: rubygem(mocha)
+Requires: rubygem-passenger-native
%if %{with_systemd}
+Requires: systemd-units
BuildRequires: systemd-units
-Requires: systemd-units
%endif
-Provides: openshift-broker = %{version}-%{release}
-BuildArch: noarch
+BuildArch: noarch
+Provides: openshift-broker = %{version}-%{release}
%description
This contains the broker 'controlling' components of OpenShift Origin.
@@ -62,10 +62,8 @@ mkdir -p %{buildroot}%{htmldir}
mkdir -p %{buildroot}%{brokerdir}
mkdir -p %{buildroot}%{brokerdir}/httpd/root
mkdir -p %{buildroot}%{brokerdir}/httpd/run
-mkdir -p %{buildroot}%{brokerdir}/httpd/logs
mkdir -p %{buildroot}%{brokerdir}/httpd/conf
mkdir -p %{buildroot}%{brokerdir}/httpd/conf.d
-mkdir -p %{buildroot}%{brokerdir}/log
mkdir -p %{buildroot}%{brokerdir}/run
mkdir -p %{buildroot}%{brokerdir}/tmp/cache
mkdir -p %{buildroot}%{brokerdir}/tmp/pids
@@ -89,10 +87,11 @@ ln -sf /etc/httpd/conf/magic %{buildroot}%{brokerdir}/httpd/conf/magic
mv %{buildroot}%{brokerdir}/httpd/000000_openshift_origin_broker_proxy.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
mv %{buildroot}%{brokerdir}/httpd/000000_openshift_origin_broker_servername.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
-mkdir -p %{buildroot}%{_localstatedir}/log/openshift
+mkdir -p %{buildroot}%{_var}/log/openshift/broker/httpd
cp -p conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker.conf
cp -p conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker-dev.conf
+cp conf/quickstarts.json %{buildroot}%{_sysconfdir}/openshift/quickstarts.json
%if 0%{?fedora} >= 18
mv %{buildroot}%{brokerdir}/httpd/httpd.conf.apache-2.4 %{buildroot}%{brokerdir}/httpd/httpd.conf
@@ -130,7 +129,7 @@ systemctl --system daemon-reload
# command line tools that will load the Rails environment and create the logs
# as root. We need the files labeled %ghost because we don't want these log
# files overwritten on RPM upgrade.
-for l in %{_localstatedir}/log/openshift/user_action.log %{brokerdir}/log/{development,production}.log; do
+for l in %{_var}/log/openshift/user_action.log %{_var}/log/openshift/broker/{development,production}.log; do
if [ ! -f $l ]; then
touch $l
fi
@@ -142,9 +141,11 @@ done
%doc LICENSE COPYRIGHT
%defattr(-,apache,apache,-)
-%attr(0644,-,-) %ghost %{brokerdir}/log/production.log
-%attr(0644,-,-) %ghost %{brokerdir}/log/development.log
-%attr(0644,-,-) %ghost %{_localstatedir}/log/openshift/user_action.log
+%dir %attr(0750,-,-) %{_var}/log/openshift/broker
+%dir %attr(0750,-,-) %{_var}/log/openshift/broker/httpd
+%attr(0644,-,-) %ghost %{_var}/log/openshift/broker/production.log
+%attr(0644,-,-) %ghost %{_var}/log/openshift/broker/development.log
+%attr(0644,-,-) %ghost %{_var}/log/openshift/user_action.log
%{brokerdir}
%{htmldir}/broker
%config %{brokerdir}/config/environments/production.rb
@@ -152,6 +153,7 @@ done
%config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_proxy.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_servername.conf
%config(noreplace) %{_sysconfdir}/openshift/broker.conf
+%config(noreplace) %{_sysconfdir}/openshift/quickstarts.json
%{_sysconfdir}/openshift/broker-dev.conf
%defattr(-,root,root,-)
@@ -163,6 +165,79 @@ done
%endif
%changelog
+* Fri Feb 15 2013 Troy Dawson <tdawson at redhat.com> 1.4.1-1
+- Added missing create for broker httpd logs dir. Updated owner of broker and
+ broker httpd logs to apache:apache. (kraman at gmail.com)
+- Fixing bad merge (kraman at gmail.com)
+- Fixing bad merge (kraman at gmail.com)
+- move logs to a more standard location (admiller at redhat.com)
+- Merge pull request #1289 from
+ smarterclayton/isolate_api_behavior_from_base_controller
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1288 from smarterclayton/improve_action_logging
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1339 from tdawson/tdawson/cleanup-spec-headers
+ (dmcphers+openshiftbot at redhat.com)
+- Merge branch 'improve_action_logging' into
+ isolate_api_behavior_from_base_controller (ccoleman at redhat.com)
+- Merge remote-tracking branch 'origin/master' into improve_action_logging
+ (ccoleman at redhat.com)
+- change %%define to %%global (tdawson at redhat.com)
+- Bug 884934 (asari.ruby at gmail.com)
+- Merge pull request #1334 from kraman/f18_fixes
+ (dmcphers+openshiftbot at redhat.com)
+- Reading hostname from node.conf file instead of relying on localhost
+ Splitting test features into common, rhel only and fedora only sections
+ (kraman at gmail.com)
+- Setting namespace and canonical_namespace for the domain together and doing
+ the same for the application (abhgupta at redhat.com)
+- Fixing init-quota to allow for tabs in fstab file Added entries in abstract
+ for php-5.4, perl-5.16 Updated python-2.6,php-5.3,perl-5.10 cart so that it
+ wont build on F18 Fixed mongo broker auth Relaxed version requirements for
+ acegi-security and commons-codec when generating hashed password for jenkins
+ Added Apache 2.4 configs for console on F18 Added httpd 2.4 specific restart
+ helper (kraman at gmail.com)
+- remove BuildRoot: (tdawson at redhat.com)
+- move rest api tests to functionals (dmcphers at redhat.com)
+- make Source line uniform among all spec files (tdawson at redhat.com)
+- Improving coverage tooling (dmcphers at redhat.com)
+- Merge pull request #1303 from pravisankar/dev/ravi/app-lock-timeout
+ (dmcphers+openshiftbot at redhat.com)
+- fix issue with reserve given not taking the valid uid (dmcphers at redhat.com)
+- - Added Application Lock Timeout (default: 10 mins) - Unit tests for Lock
+ model (rpenta at redhat.com)
+- Ensure lib directory is in the autoload path, do not require rubygems when
+ developing from source (ccoleman at redhat.com)
+- Do not use a global variable to initialize a RestReply - use a controller
+ helper method. (ccoleman at redhat.com)
+- netrc should only be loaded in source mode (test env loads it via a patched
+ gem) (ccoleman at redhat.com)
+- Allow broker to be started using source directly (ccoleman at redhat.com)
+- working on testing coverage (dmcphers at redhat.com)
+- Handle numbers for users and passwords (dmcphers at redhat.com)
+- US2626 changes based on feedback - Add application name in Usage and
+ UsageRecord models - Change 'price' to 'usage_rate_usd' in rest cartridge
+ model - Change 'charges' to 'usage_rates' in rails configuration - Rails
+ configuration stores usage_rates for different currencies (currently only
+ have usd) (rpenta at redhat.com)
+- Merge pull request #1260 from abhgupta/abhgupta-dev
+ (dmcphers+openshiftbot at redhat.com)
+- Fix for bug 906266, bug 906230, and bug 906233 (abhgupta at redhat.com)
+- US3350 - Expose a plan_upgrade_enabled capability that indicates whether
+ users can select a plan (ccoleman at redhat.com)
+- Merge pull request #1230 from abhgupta/abhgupta-dev
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1232 from pravisankar/dev/ravi/fix-broker-extended-tests
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1233 from danmcp/master (dmcphers at redhat.com)
+- Fix Broker extended tests, Don't call observers for cloud user model if the
+ record is already persisted. (rpenta at redhat.com)
+- remove consumed_gear_sizes (dmcphers at redhat.com)
+- removing legacy broker rest api (abhgupta at redhat.com)
+
+* Fri Feb 08 2013 Troy Dawson <tdawson at redhat.com> 1.4.0-1
+- Update to version 1.4.0
+
* Mon Jan 28 2013 Krishna Raman <kraman at gmail.com> 1.1.2-1
- Merge pull request #1212 from brenton/misc5
(dmcphers+openshiftbot at redhat.com)
diff --git a/sources b/sources
index 104a36c..74d7d84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd45f2bdfd52505b44c300f5404f3def openshift-origin-broker-1.1.2.tar.gz
+20afafd4fc80752c14549270fb8c744d openshift-origin-broker-1.4.1.tar.gz
More information about the scm-commits
mailing list