[rubygem-openshift-origin-controller] updating to 1.0.5

[tdawson]

commit 1d14693c8e7f22c070ed87ea97e4d233c55b8e47
Author: Troy Dawson <tdawson at redhat.com>
Date:   Fri Nov 30 14:57:19 2012 -0600

    updating to 1.0.5

 .gitignore                                         |    1 +
 ...ft-origin-controller_add_mongo_to_gemspec.patch |   27 ------------
 openshift-origin-controller_fix_test_deps.patch    |   19 --------
 ...-origin-controller_stickshift-common-load.patch |    9 ----
 rubygem-openshift-origin-controller.spec           |   45 +++++++-------------
 sources                                            |    2 +-
 6 files changed, 18 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5fb8d9..fc5cc34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /openshift-origin-controller-0.14.15.gem
+/openshift-origin-controller-1.0.5.gem
diff --git a/rubygem-openshift-origin-controller.spec b/rubygem-openshift-origin-controller.spec
index a2f3b57..d2964e6 100644
--- a/rubygem-openshift-origin-controller.spec
+++ b/rubygem-openshift-origin-controller.spec
@@ -14,24 +14,14 @@
 %endif
 
 
-Summary:        Rails engine for the OpenShift Broker API
+Summary:        OpenShift Development Controller
 Name:           rubygem-%{gem_name}
-Version:        0.14.15
-Release:        11%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
-Source0:        http://mirror.openshift.com/pub/openshift-origin/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
-# https://github.com/openshift/crankcase/pull/390
-Patch0:         openshift-origin-controller_fix_test_deps.patch
-# This patch is actually not needed upstream.  The OpenShift team is in the
-# process of renaming the packages for Fedora.  Once the packages are accepted
-# the packages will be renamed on the master branch to match Fedora.
-#https://github.com/openshift/crankcase/blob/master/stickshift/controller/lib/stickshift-controller.rb
-# Patch1 removed.  Fixing library names
-#Patch1:         openshift-origin-controller_stickshift-common-load.patch
-# https://github.com/openshift/crankcase/pull/422
-Patch2:         openshift-origin-controller_add_mongo_to_gemspec.patch
+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)
@@ -47,8 +37,7 @@ BuildArch:      noarch
 Provides:       rubygem(%{gem_name}) = %version
 
 %description
-This packages contains a Rails engine that provides the majority of the
-OpenShift Broker API.
+This contains the OpenShift Development Controller packaged as a rubygem.
 
 %prep
 gem unpack %{SOURCE0}
@@ -56,15 +45,6 @@ gem unpack %{SOURCE0}
 
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
-# Note: The patching of the spec file must happen after the 'gem spec' command.
-%patch0 -p1
-#%patch1 -p1
-%patch2 -p1
-
-# rename lib to correct name
-mv lib/stickshift-controller.rb lib/openshift-origin-controller.rb
-sed -i -e 's|\"lib/stickshift-controller.rb\"|\"lib/openshift-origin-controller.rb\"|' %{gem_name}.gemspec
-
 %build
 mkdir -p .%{gem_dir}
 
@@ -84,10 +64,13 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 rm -rf %{buildroot}%{gem_instdir}/test
 
-# https://github.com/openshift/crankcase/pull/344
-chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/models/application.rb
-chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/models/gear.rb
-chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/controllers/base_controller.rb
+#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
+
 
 %files
 %dir %{gem_instdir}
@@ -104,6 +87,10 @@ chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/controllers/base_
 %exclude %{gem_instdir}/%{name}.spec
 
 %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
 
diff --git a/sources b/sources
index 80dbb0d..d91792f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-256a9e7d72de5b2c0a151698a32eddb3  openshift-origin-controller-0.14.15.gem
+ecf1faee383248e86ae2ff2fb8e8eadc  openshift-origin-controller-1.0.5.gem