[rubygem-openshift-origin-msg-broker-mcollective] update to version 1.3.5

tdawson tdawson at fedoraproject.org
Wed Jan 30 15:39:22 UTC 2013


commit de6540aac85922069b0d9879cce919a5ab084758
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 09:39:15 2013 -0600

    update to version 1.3.5

 .gitignore                                         |    1 +
 ...em-openshift-origin-msg-broker-mcollective.spec |   72 +++++++++++---------
 sources                                            |    2 +-
 3 files changed, 41 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9415f37..4fe70c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /openshift-origin-msg-broker-mcollective-1.0.1.gem
 /openshift-origin-msg-broker-mcollective-1.1.6.gem
 /openshift-origin-msg-broker-mcollective-1.2.7.gem
+/openshift-origin-msg-broker-mcollective-1.3.5.gem
diff --git a/rubygem-openshift-origin-msg-broker-mcollective.spec b/rubygem-openshift-origin-msg-broker-mcollective.spec
index f826a15..7446316 100644
--- a/rubygem-openshift-origin-msg-broker-mcollective.spec
+++ b/rubygem-openshift-origin-msg-broker-mcollective.spec
@@ -1,25 +1,18 @@
-%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-msg-broker-mcollective
 %global rubyabi 1.9.1
 
 Summary:        OpenShift plugin for mcollective service
 Name:           rubygem-%{gem_name}
-Version:        1.2.7
+Version:        1.3.5
 Release:        2%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
-Source0:        https://mirror.openshift.com/pub/origin-server/source/%{name}/%{gem_name}-%{version}.gem
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
-Requires:       %{?scl:%scl_prefix}ruby
-Requires:       %{?scl:%scl_prefix}rubygems
-Requires:       %{?scl:%scl_prefix}rubygem(json)
+Source0:        https://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{gem_name}-%{version}.gem
+Requires:       ruby(abi) = %{rubyabi}
+Requires:       ruby
+Requires:       rubygems
+Requires:       rubygem(json)
 Requires:       rubygem(openshift-origin-common)
 Requires:       mcollective
 Requires:       mcollective-client
@@ -29,31 +22,22 @@ Requires:       ruby-qpid-qmf
 Requires:       selinux-policy-targeted
 Requires:       policycoreutils-python
 Requires:       openshift-origin-msg-common
-Requires:       %{?scl:%scl_prefix}ruby-qpid-qmf
-%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
+Requires:       ruby-qpid-qmf
+BuildRequires:  ruby(abi) = %{rubyabi}
+BuildRequires:  ruby
+BuildRequires:  rubygems
+BuildRequires:  rubygems-devel
 BuildArch:      noarch
-Obsoletes:      rubygem-gearchanger-mcollective-plugin
-Obsoletes:      rubygem-gearchanger-m-collective-plugin
 
 %description
 OpenShift plugin for mcollective based node/gear manager
 
 %prep
-%{?scl:scl enable %scl - << \EOF}
 gem unpack %{SOURCE0}
 %setup -q -D -T -n  %{gem_name}-%{version}
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-%{?scl:EOF}
 
 %build
-%{?scl:scl enable %scl - << \EOF}
 mkdir -p .%{gem_dir}
 # Build and install into the rubygem structure
 gem build %{gem_name}.gemspec
@@ -62,10 +46,8 @@ gem install -V \
         --install-dir ./%{gem_dir} \
         --bindir ./%{_bindir} \
         --force %{gem_name}-%{version}.gem
-%{?scl:EOF}
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gem_dir}
 
 cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
@@ -73,11 +55,10 @@ cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 mkdir -p %{buildroot}/etc/openshift/plugins.d
 cp %{buildroot}/%{gem_dir}/gems/%{gem_name}-%{version}/conf/openshift-origin-msg-broker-mcollective.conf.example %{buildroot}/etc/openshift/plugins.d/openshift-origin-msg-broker-mcollective.conf.example
 
-%clean
-rm -rf %{buildroot}
+# Cleanup
+rm -rf %{buildroot}%{gem_instdir}/.yardoc
 
 %files
-%defattr(-,root,root,-)
 %dir %{gem_instdir}
 %dir %{gem_dir}
 %doc Gemfile LICENSE
@@ -91,8 +72,33 @@ rm -rf %{buildroot}
 %attr(0644,-,-) %ghost /etc/mcollective/client.cfg
 
 %changelog
-* Tue Jan 15 2013 Troy Dawson <tdawson at redhat.com> 1.2.7-2
+* Tue Jan 29 2013 Troy Dawson <tdawson at redhat.com> 1.3.5-2
 - Change the source from a tar to gem
+- Remove scl for Fedora standards
+
+* Wed Jan 23 2013 Adam Miller <admiller at redhat.com> 1.3.5-1
+- Bug 902690 Cant use direct addressing mode when facts are required
+  (dmcphers at redhat.com)
+
+* Mon Jan 21 2013 Adam Miller <admiller at redhat.com> 1.3.4-1
+- set timeout to disc timeout for direct addressing (dmcphers at redhat.com)
+- Fix include? (dmcphers at redhat.com)
+- Still need to use broadcast for get all gears methods (dmcphers at redhat.com)
+- favor different nodes within a gear group (dmcphers at redhat.com)
+
+* Fri Jan 18 2013 Dan McPherson <dmcphers at redhat.com> 1.3.3-1
+- added add/remove ssl cert methods to ease merge (mlamouri at redhat.com)
+- adding rdoc to mcollective_application_container (mlamouri at redhat.com)
+- SSL support for custom domains. (mpatel 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.2-1
+- dont return nil resultIO (dmcphers at redhat.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)
 
 * Mon Dec 10 2012 Adam Miller <admiller at redhat.com> 1.2.7-1
 - fix for bug 883607 (abhgupta at redhat.com)
diff --git a/sources b/sources
index 806f351..29ecf5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e37b73e8c154d85cb0c86893c3acefb1  openshift-origin-msg-broker-mcollective-1.2.7.gem
+19fed5bf8e8d5811f3918874ad802937  openshift-origin-msg-broker-mcollective-1.3.5.gem


More information about the scm-commits mailing list