[rubygem-openshift-origin-controller] updated to version 1.1.10
tdawson
tdawson at fedoraproject.org
Tue Dec 4 22:28:16 UTC 2012
commit 43f81f1d8a055d6453d6c55ac87dc20d78092e31
Author: Troy Dawson <tdawson at redhat.com>
Date: Tue Dec 4 16:28:11 2012 -0600
updated to version 1.1.10
.gitignore | 1 +
rubygem-openshift-origin-controller.spec | 255 ++++++++++++++++-------------
sources | 2 +-
3 files changed, 143 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc5cc34..b6989a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/openshift-origin-controller-0.14.15.gem
/openshift-origin-controller-1.0.5.gem
+/openshift-origin-controller-1.1.10.gem
diff --git a/rubygem-openshift-origin-controller.spec b/rubygem-openshift-origin-controller.spec
index d2964e6..4c9c2d5 100644
--- a/rubygem-openshift-origin-controller.spec
+++ b/rubygem-openshift-origin-controller.spec
@@ -1,53 +1,54 @@
-%global gem_name openshift-origin-controller
-
-# Conditionally set required macros for distros without rubygems-devel This can
-# be removed once https://bugzilla.redhat.com/show_bug.cgi?id=788001 is
-# resolved.
-%if 0%{?el6}%{?fc16}
-%global rubyabi 1.8
-%global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
-%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
-%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
-%global gem_libdir %{gem_instdir}/lib
-%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
+%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: OpenShift Development Controller
+Summary: Cloud Development Controller
Name: rubygem-%{gem_name}
-Version: 1.0.5
-Release: 1%{?dist}
-Group: Development/Tools
+Version: 1.1.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: ruby(abi) >= 1.8
-Requires: rubygems
-Requires: rubygem(state_machine)
+Requires: %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+Requires: %{?scl:%scl_prefix}ruby
+Requires: %{?scl:%scl_prefix}rubygems
+Requires: %{?scl:%scl_prefix}rubygem(state_machine)
Requires: rubygem(openshift-origin-common)
-Requires: rubygem(mongo)
-
-%if 0%{?rhel} == 6
-BuildRequires: rubygems
-%else
-BuildRequires: rubygems-devel
+%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
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %version
+Obsoletes: rubygem-stickshift-controller
%description
-This contains the OpenShift Development Controller packaged as a rubygem.
+This contains the Cloud Development Controller packaged as a rubygem.
+
+%package doc
+Summary: Cloud Development Controller docs
+
+%description doc
+Cloud Development Controller ri documentation
%prep
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
-
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
@@ -58,98 +59,124 @@ gem install -V \
--force \
--rdoc \
%{gem_name}-%{version}.gem
+%{?scl:EOF}
%install
mkdir -p %{buildroot}%{gem_dir}
cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
-rm -rf %{buildroot}%{gem_instdir}/test
+mkdir -p %{buildroot}/etc/openshift/
#cleanup
-chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/models/application.rb
-chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/models/name_server_cache.rb
-chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/models/cartridge_cache.rb
-chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/controllers/base_controller.rb
-chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/lib/openshift/dns_service.rb
-
+rm -rf %{buildroot}%{gem_instdir}/test
+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
+chmod 0644 %{buildroot}%{gem_instdir}/app/controllers/base_controller.rb
+chmod 0644 %{buildroot}%{gem_instdir}/lib/openshift/dns_service.rb
%files
-%dir %{gem_instdir}
-%{gem_instdir}/Gemfile
-%{gem_instdir}/Rakefile
-%{gem_libdir}
-%{gem_instdir}/%{gem_name}.gemspec
-%{gem_spec}
-%doc %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/COPYRIGHT
-%doc %{gem_docdir}
+%doc %{gem_instdir}/Gemfile
+%doc %{gem_instdir}/LICENSE
%doc %{gem_instdir}/README.md
-%exclude %{gem_cache}
-%exclude %{gem_instdir}/%{name}.spec
+%doc %{gem_instdir}/COPYRIGHT
+%{gem_instdir}
+%{gem_cache}
+%{gem_spec}
+
+%files doc
+%doc %{gem_dir}/doc/%{gem_name}-%{version}
%changelog
-* Fri Nov 30 2012 Troy Dawson <tdawson at redhat.com> 1.0.5-1
-- Update to 1.0.5
-- Removed unneeded patches
-
-* Wed Aug 22 2012 Troy Dawson <tdawson at redhat.com> - 0.14.15-11
-- Renamed library to correct name
-
-* Wed Aug 22 2012 Brenton Leanhardt <bleanhar at redhat.com> - 0.14.15-10
-- Patched gemspec to add rubygem-mongo dependency
-
-* Tue Aug 21 2012 Brenton Leanhardt <bleanhar at redhat.com> - 0.14.15-9
-- Adding rubygem-mongo require
-- Patching openshift-origin-common load
-
-* Mon Aug 20 2012 Brenton Leanhardt <bleanhar at redhat.com> - 0.14.15-8
-- Properly recreate the gemspec with 'gem spec'
-- Dropped upstreamed openshift-origin-controller_gemspec_fixes.patch
-
-* Fri Aug 17 2012 Brenton Leanhardt <bleanhar at redhat.com> - 0.14.15-7
-- Fixed prep and build sections
-- Removed ruby-devel BuildRequire
-- Removed useless CONFIGURE_ARGS variable
-- Proper usage of gem_libdir and gem_instdir in install section
-- Correctly incorrect usage of doc directive and fixed incorrect gem_libdir
- exclusion
-
-* Thu Aug 16 2012 Brenton Leanhardt <bleanhar at redhat.com> - 0.14.15-6
-- Using rubygem-devel macros
-- Removed open4, and json requirement and patched gemspec. These were used
- only for tests.
-- Remove unneeded activemodel require
-
-* Fri Aug 10 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.15-5
-- Added patch to fix project homepage
-
-* Tue Aug 07 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.15-4
-- Removed tests
-- Fixed file modes
-
-* Mon Aug 06 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.15-3
-- Removed unneeded BuildRoot tag
-- Removed unneeded clean section
-- Removed unneeded defattr usage
-- Removed unneeded cached gem
-- Removed unneeded highline, parseconfig and json_pure BuildRequires
-- Fixed the Source0 URL
-
-* Thu Aug 02 2012 Troy Dawson <tdawson at redhat.com> 0.14.15-1
-- Renamed package to openshift-origin-node
-- Updated to the latest upstream stable release
-- Added LICENSE and COPYRIGHT to doc
-
-* Fri Jul 20 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.4-1
-- Latest upstream release
-- Switched Source0 to gem
-
-* Wed Jul 18 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.2-1
-- Added ruby-devel and rubygem-devel build requires and replaced the
- ruby_sitelib and geminstdir macros with the standard macros.
-- Renamed %%gemname to %%gem_name so %%geminstdir will work correctly.
-- Fixed several file mode problems with libraries
-- Rebased to the latest upstream version
-
-* Mon Jul 09 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.1-1
-- Initial package creation for Fedora
-- Removed rcov
+* Tue Dec 04 2012 Troy Dawson <tdawson at redhat.com> 1.1.10-2
+- Change the source from a tar to gem
+- Add cleanup
+
+* Fri Nov 16 2012 Adam Miller <admiller at redhat.com> 1.1.10-1
+- Bug 877340 (dmcphers at redhat.com)
+- Merge pull request #913 from
+ smarterclayton/better_gear_limit_message_on_create (openshift+bot at redhat.com)
+- Bug 876796 (dmcphers at redhat.com)
+- fix typo (dmcphers at redhat.com)
+- Return a better error message when the gear limit on app creation is reached.
+ (ccoleman at redhat.com)
+
+* Thu Nov 15 2012 Adam Miller <admiller at redhat.com> 1.1.9-1
+- fix broker extended tests (dmcphers at redhat.com)
+- more ruby1.9 changes (dmcphers at redhat.com)
+- Merge pull request #911 from rajatchopra/master (openshift+bot at redhat.com)
+- Merge pull request #910 from jwhonce/dev/bz876687 (openshift+bot at redhat.com)
+- fix for bug#875258 (rchopra at redhat.com)
+- Merge pull request #907 from danmcp/master (dmcphers at redhat.com)
+- remove spurious output (jhonce at redhat.com)
+- Merge pull request #909 from pravisankar/dev/ravi/us3043_bugs
+ (dmcphers at redhat.com)
+- Merge pull request #904 from bdecoste/master (openshift+bot at redhat.com)
+- Bug 876459 (dmcphers at redhat.com)
+- Fix for bug# 876516 (rpenta at redhat.com)
+- Fix bug# 876124: caused due to ruby 1.8 to 1.9 upgrade (rpenta at redhat.com)
+- switchyard tests (bdecoste at gmail.com)
+
+* Wed Nov 14 2012 Adam Miller <admiller at redhat.com> 1.1.8-1
+- Merge pull request #906 from ironcladlou/db-test-fixes (dmcphers at redhat.com)
+- Fix typo resulting in undefined stepdef (ironcladlou at gmail.com)
+
+* Wed Nov 14 2012 Adam Miller <admiller at redhat.com> 1.1.7-1
+- Compare retcode as an int rather than string (ironcladlou at gmail.com)
+- Merge pull request #895 from smarterclayton/us3046_quickstarts_and_app_types
+ (openshift+bot at redhat.com)
+- Merge remote-tracking branch 'origin/master' into
+ us3046_quickstarts_and_app_types (ccoleman at redhat.com)
+- Merge remote-tracking branch 'origin/master' into
+ us3046_quickstarts_and_app_types (ccoleman at redhat.com)
+- Quickstart URLs aren't spec compliant (ccoleman at redhat.com)
+- Relativize base URL (ccoleman at redhat.com)
+- Support COMMUNITY_QUICKSTARTS_URL parameter for serving hardcoded quickstarts
+ vs. public quickstarts, and test that these values are returned.
+ (ccoleman at redhat.com)
+- US3046: Allow quickstarts to show up in the UI (ccoleman at redhat.com)
+
+* Wed Nov 14 2012 Adam Miller <admiller at redhat.com> 1.1.6-1
+- fix testdescriptor generator (dmcphers at redhat.com)
+- get the broker working again (dmcphers at redhat.com)
+- Move trap-user.feature and trap-user-extended.feature to origin-server
+ (pmorie at gmail.com)
+- Test support and nodejs test fixes for Ruby 1.9 (ironcladlou at gmail.com)
+- fixing tests (dmcphers at redhat.com)
+- Remove hard-coded ruby references (ironcladlou at gmail.com)
+- add config to gemspec (dmcphers at redhat.com)
+- Moving plugins to Rails 3.2.8 engine (kraman at gmail.com)
+- Ruby 1.9 compatibility fixes (ironcladlou at gmail.com)
+- getting specs up to 1.9 sclized (dmcphers at redhat.com)
+- Merge pull request #894 from jwhonce/master (openshift+bot at redhat.com)
+- Merge pull request #888 from pravisankar/dev/ravi/bug/876124
+ (dmcphers at redhat.com)
+- Fix for Bug# 876124 (rpenta at redhat.com)
+- Move idler tests to origin-server (jhonce at redhat.com)
+- specifying rake gem version range (abhgupta at redhat.com)
+
+* Tue Nov 13 2012 Adam Miller <admiller at redhat.com> 1.1.5-1
+- specifying mocha gem version and fixing tests (abhgupta at redhat.com)
+
+* Mon Nov 12 2012 Adam Miller <admiller at redhat.com> 1.1.4-1
+- Merge pull request #859 from lnader/master (openshift+bot at redhat.com)
+- US3043: store initial_git_url (lnader at redhat.com)
+- US3043: Allow applications to be created from adhoc application templates
+ (lnader at redhat.com)
+
+* Thu Nov 08 2012 Adam Miller <admiller at redhat.com> 1.1.3-1
+- Merge pull request #845 from brenton/BZ873992-origin
+ (openshift+bot at redhat.com)
+- Merge pull request #844 from jwhonce/dev/bz873810 (openshift+bot at redhat.com)
+- Bug 873992 - [onpremise][Client]Should delete all the prompts about
+ mongodb-2.2 cartridge. (bleanhar at redhat.com)
+- Merge pull request #839 from pravisankar/dev/ravi/fix-env-controller-auth
+ (openshift+bot at redhat.com)
+- Disable auth for environment controller (rpenta at redhat.com)
+- Fix for Bug 873810 (jhonce at redhat.com)
+- fixing origin tests (abhgupta at redhat.com)
+
+* Thu Nov 01 2012 Adam Miller <admiller at redhat.com> 1.1.2-1
+- Merge pull request #815 from pravisankar/dev/ravi/fix_nameserver_resolver
+ (openshift+bot at redhat.com)
+- Fix name server cache: query up the chain to find dns resolver nameservers
+ (rpenta at redhat.com)
diff --git a/sources b/sources
index d91792f..6563f10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecf1faee383248e86ae2ff2fb8e8eadc openshift-origin-controller-1.0.5.gem
+81f719be814d5cc742e2d94b4f561f97 openshift-origin-controller-1.1.10.gem
More information about the scm-commits
mailing list