[rubygem-openshift-origin-controller] Renamed library to correct name
tdawson
tdawson at fedoraproject.org
Wed Aug 22 15:19:06 UTC 2012
commit c8be1015b54cecf5047b82a222a4aa72569fe8e8
Author: Troy Dawson <tdawson at redhat.com>
Date: Wed Aug 22 10:18:57 2012 -0500
Renamed library to correct name
rubygem-openshift-origin-controller.spec | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/rubygem-openshift-origin-controller.spec b/rubygem-openshift-origin-controller.spec
index b0298c3..a2f3b57 100644
--- a/rubygem-openshift-origin-controller.spec
+++ b/rubygem-openshift-origin-controller.spec
@@ -17,7 +17,7 @@
Summary: Rails engine for the OpenShift Broker API
Name: rubygem-%{gem_name}
Version: 0.14.15
-Release: 10%{?dist}
+Release: 11%{?dist}
Group: Development/Tools
License: ASL 2.0
URL: http://openshift.redhat.com
@@ -28,7 +28,8 @@ Patch0: openshift-origin-controller_fix_test_deps.patch
# 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: openshift-origin-controller_stickshift-common-load.patch
+# 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
Requires: ruby(abi) >= 1.8
@@ -57,9 +58,13 @@ 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
+#%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}
@@ -99,6 +104,9 @@ chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/controllers/base_
%exclude %{gem_instdir}/%{name}.spec
%changelog
+* 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
More information about the scm-commits
mailing list