[rubygem-openshift-origin-controller] update to version 1.3.10
tdawson
tdawson at fedoraproject.org
Wed Jan 30 15:38:23 UTC 2013
commit 6abcf3bd98b0203c4255261365283a8d1e931de6
Author: Troy Dawson <tdawson at redhat.com>
Date: Wed Jan 30 09:38:17 2013 -0600
update to version 1.3.10
.gitignore | 1 +
rubygem-openshift-origin-controller.spec | 112 +++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 90 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87d09a6..ed8e27e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/openshift-origin-controller-1.0.5.gem
/openshift-origin-controller-1.1.10.gem
/openshift-origin-controller-1.2.10.gem
+/openshift-origin-controller-1.3.10.gem
diff --git a/rubygem-openshift-origin-controller.spec b/rubygem-openshift-origin-controller.spec
index 04b12e9..bfa630c 100644
--- a/rubygem-openshift-origin-controller.spec
+++ b/rubygem-openshift-origin-controller.spec
@@ -1,36 +1,25 @@
-%if 0%{?fedora}%{?rhel} <= 6
- %global scl ruby193
- %global scl_prefix ruby193-
-%endif
-%{!?scl:%global pkg_name %{name}}
-%{?scl:%scl_package rubygem-%{gem_name}}
%global gem_name openshift-origin-controller
%global rubyabi 1.9.1
Summary: Cloud Development Controller
Name: rubygem-%{gem_name}
-Version: 1.2.10
+Version: 1.3.10
Release: 2%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://openshift.redhat.com
-Source0: http://mirror.openshift.com/pub/origin-server/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
-Requires: %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
-Requires: %{?scl:%scl_prefix}ruby
-Requires: %{?scl:%scl_prefix}rubygems
-Requires: %{?scl:%scl_prefix}rubygem(state_machine)
+Source0: http://mirror.openshift.com/pub/openshift-origin/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
+Requires: ruby(abi) = %{rubyabi}
+Requires: ruby
+Requires: rubygems
+Requires: rubygem(state_machine)
Requires: rubygem(openshift-origin-common)
-%if 0%{?fedora}%{?rhel} <= 6
-BuildRequires: ruby193-build
-BuildRequires: scl-utils-build
-%endif
-BuildRequires: %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
-BuildRequires: %{?scl:%scl_prefix}ruby
-BuildRequires: %{?scl:%scl_prefix}rubygems
-BuildRequires: %{?scl:%scl_prefix}rubygems-devel
+BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby
+BuildRequires: rubygems
+BuildRequires: rubygems-devel
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %version
-Obsoletes: rubygem-stickshift-controller
%description
This contains the Cloud Development Controller packaged as a rubygem.
@@ -47,7 +36,6 @@ gem unpack %{SOURCE0}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%build
-%{?scl:scl enable %scl - << \EOF}
mkdir -p .%{gem_dir}
# Create the gem as gem install only works on a gem file
gem build %{gem_name}.gemspec
@@ -59,7 +47,6 @@ gem install -V \
--force \
--rdoc \
%{gem_name}-%{version}.gem
-%{?scl:EOF}
%install
mkdir -p %{buildroot}%{gem_dir}
@@ -68,6 +55,7 @@ mkdir -p %{buildroot}/etc/openshift/
#cleanup
rm -rf %{buildroot}%{gem_instdir}/test
+rm -rf %{buildroot}%{gem_instdir}/.yardoc
chmod 0644 %{buildroot}%{gem_instdir}/app/models/application.rb
chmod 0644 %{buildroot}%{gem_instdir}/app/models/name_server_cache.rb
chmod 0644 %{buildroot}%{gem_instdir}/app/models/cartridge_cache.rb
@@ -87,9 +75,85 @@ chmod 0644 %{buildroot}%{gem_instdir}/lib/openshift/dns_service.rb
%doc %{gem_dir}/doc/%{gem_name}-%{version}
%changelog
-* Tue Jan 15 2013 Troy Dawson <tdawson at redhat.com> 1.2.10-2
+* Tue Jan 29 2013 Troy Dawson <tdawson at redhat.com> 1.3.10-2
- Change the source from a tar to gem
- Add cleanup
+- Remove scl for Fedora standards
+
+* Fri Jan 25 2013 Adam Miller <admiller at redhat.com> 1.3.10-1
+- turn off safe mode for now (dmcphers at redhat.com)
+
+* Thu Jan 24 2013 Adam Miller <admiller at redhat.com> 1.3.9-1
+- Ensure write to at least 2 mongo instances (dmcphers at redhat.com)
+
+* Mon Jan 21 2013 Adam Miller <admiller at redhat.com> 1.3.8-1
+- Merge pull request #1183 from danmcp/master
+ (dmcphers+openshiftbot at redhat.com)
+- Bug 902117 (dmcphers at redhat.com)
+
+* Mon Jan 21 2013 Adam Miller <admiller at redhat.com> 1.3.7-1
+- Merge pull request #500 from mscherer/fix_missing_jsondata
+ (dmcphers+openshiftbot at redhat.com)
+- include webproxy group instance in non ha list (dmcphers at redhat.com)
+- favor different nodes within a gear group (dmcphers at redhat.com)
+- Merge pull request #1169 from smarterclayton/use_nahi_httpclient_instead
+ (dmcphers+openshiftbot at redhat.com)
+- Merge branch 'master' of git://github.com/openshift/origin-server into
+ use_nahi_httpclient_instead (ccoleman at redhat.com)
+- Use --insecure in tests Use --clean to isolate problems, purge the express
+ config Swap node_steps to use rhc_delete_domain/create_domain for sanity
+ (ccoleman at redhat.com)
+- Do not return a unclear error message if json_data is not set
+ (mscherer at redhat.com)
+
+* Fri Jan 18 2013 Dan McPherson <dmcphers at redhat.com> 1.3.6-1
+- Adding support for broker to mongodb connections over SSL
+ (calfonso at redhat.com)
+- Merge pull request #1163 from ironcladlou/endpoint-refactor
+ (dmcphers at redhat.com)
+- Replace expose/show/conceal-port hooks with Endpoints (ironcladlou at gmail.com)
+
+* Thu Jan 17 2013 Adam Miller <admiller at redhat.com> 1.3.5-1
+- Bug 895269 (dmcphers at redhat.com)
+
+* Mon Jan 14 2013 Adam Miller <admiller at redhat.com> 1.3.4-1
+- Merge pull request #1145 from bdecoste/master
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1146 from pmorie/bugs/fix-tests2
+ (dmcphers+openshiftbot at redhat.com)
+- increase jenkins creation timeout (bdecoste at gmail.com)
+- Fix failing socket file tests (pmorie at gmail.com)
+- Merge pull request #916 from Miciah/devenv-fixes-2
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1142 from bdecoste/master
+ (dmcphers+openshiftbot at redhat.com)
+- kill orphan jenkins process (bdecoste at gmail.com)
+- harden JSON parsing for jenkins test (bdecoste at gmail.com)
+- Add @not-enterprise tag to some tests (miciah.masters at gmail.com)
+- Fix tests to use newer-style rhc invocations (miciah.masters at gmail.com)
+
+* Thu Jan 10 2013 Adam Miller <admiller at redhat.com> 1.3.3-1
+- increased jenkins test timeout (bdecoste at gmail.com)
+- Merge pull request #1134 from bdecoste/master
+ (dmcphers+openshiftbot at redhat.com)
+- updated ews2 tests (bdecoste at gmail.com)
+- Fix BZ892006: Make postgresql socket file access solvent and add tests for
+ postgres and mysql socket files. (pmorie at gmail.com)
+- added ews2 tests (bdecoste at gmail.com)
+- Refactor to use env var rather than output from hook (jhonce at redhat.com)
+- Merge pull request #1083 from bdecoste/master (openshift+bot at redhat.com)
+- re-enabed ews2 (bdecoste at gmail.com)
+
+* Tue Dec 18 2012 Adam Miller <admiller at redhat.com> 1.3.2-1
+- - oo-setup-broker fixes: - Open dns ports for access to DNS server from
+ outside the VM - Turn on SELinux booleans only if they are off (Speeds up
+ re-install) - Added console SELinux booleans - oo-setup-node fixes: -
+ Setup mcollective to use broker IPs - Updates abstract cartridges to set
+ proper order for php-5.4 and postgres-9.1 cartridges - Updated broker to add
+ fedora 17 cartridges - Fixed facts cron job (kraman at gmail.com)
+
+* Wed Dec 12 2012 Adam Miller <admiller at redhat.com> 1.3.1-1
+- bump_minor_versions for sprint 22 (admiller at redhat.com)
* Wed Dec 12 2012 Adam Miller <admiller at redhat.com> 1.2.10-1
- Merge pull request #986 from BanzaiMan/dev/hasari/us2975
diff --git a/sources b/sources
index 0473998..9519cec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04885f147182d695490871562a38e3db openshift-origin-controller-1.2.10.gem
+7d15ffc3e442b310653c8812a9bc6e77 openshift-origin-controller-1.3.10.gem
More information about the scm-commits
mailing list