[rubygem-openshift-origin-msg-broker-mcollective] update to 1.1.6
tdawson
tdawson at fedoraproject.org
Thu Dec 6 15:23:45 UTC 2012
commit b8593fed86b8459b2a7d3f2a98943ddbf97a6685
Author: Troy Dawson <tdawson at redhat.com>
Date: Thu Dec 6 09:23:40 2012 -0600
update to 1.1.6
.gitignore | 1 +
...em-openshift-origin-msg-broker-mcollective.spec | 215 ++++++++------------
sources | 2 +-
3 files changed, 84 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4861a2e..d848017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/openshift-origin-msg-broker-mcollective-0.1.1.gem
/openshift-origin-msg-broker-mcollective-1.0.1.gem
+/openshift-origin-msg-broker-mcollective-1.1.6.gem
diff --git a/rubygem-openshift-origin-msg-broker-mcollective.spec b/rubygem-openshift-origin-msg-broker-mcollective.spec
index 112ff09..f5baf64 100644
--- a/rubygem-openshift-origin-msg-broker-mcollective.spec
+++ b/rubygem-openshift-origin-msg-broker-mcollective.spec
@@ -1,173 +1,122 @@
+%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
-%if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
-
-%global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
-%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
-%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
-%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
-
-%endif #end rhel <= 6 && fedora <= 16
-
-Summary: OpenShift Origin plugin for mcollective service
+Summary: OpenShift plugin for mcollective service
Name: rubygem-%{gem_name}
-Version: 1.0.1
-Release: 1%{?dist}
+Version: 1.1.6
+Release: 2%{?dist}
Group: Development/Languages
License: ASL 2.0
-URL: https://openshift.redhat.com/community/open-source
-Source0: https://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{gem_name}-%{version}.gem
-
-%if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
-Requires: ruby(abi) = 1.8
-%endif
-%if 0%{?fedora} >= 17
-Requires: ruby(abi) = 1.9.1
-%endif
-Requires: rubygems
-Requires: mcollective-client
+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)
Requires: rubygem(openshift-origin-common)
-Requires: rubygem(json)
+Requires: mcollective
+Requires: mcollective-client
+Requires: qpid-cpp-server
+Requires: qpid-cpp-client
+Requires: ruby-qpid-qmf
Requires: selinux-policy-targeted
Requires: policycoreutils-python
-
-%if 0%{?fedora} >= 17
-BuildRequires: rubygems-devel
+%if 0%{?fedora}%{?rhel} <= 6
+Requires: ruby193-mcollective-common
+Requires: ruby193-ruby-qpid-qmf
+BuildRequires: ruby193-build
+BuildRequires: scl-utils-build
%endif
-BuildRequires: ruby
-BuildRequires: rubygems
+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-gearchanger-mcollective-plugin
+Obsoletes: rubygem-gearchanger-m-collective-plugin
%description
-OpenShift Origin plugin for mcollective based node/gear manager
-
-%package doc
-Summary: OpenShift Origin plugin for mcollective docs
-
-%description doc
-OpenShift Origin plugin for mcollective based node/gear manager ri documentation
+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
-mkdir -p ./%{gem_dir}
gem build %{gem_name}.gemspec
gem install -V \
--local \
--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}/
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}
+
%files
-%doc %{gem_instdir}/Gemfile
-%doc %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/README.md
-%doc %{gem_instdir}/COPYRIGHT
-%{gem_instdir}
-%{gem_cache}
-%{gem_spec}
-%{_sysconfdir}/openshift/plugins.d/openshift-origin-msg-broker-mcollective.conf.example
-
-%files doc
-%{gem_docdir}
+%defattr(-,root,root,-)
+%dir %{gem_instdir}
+%dir %{gem_dir}
+%doc Gemfile LICENSE
+%{gem_dir}/doc/%{gem_name}-%{version}
+%{gem_dir}/gems/%{gem_name}-%{version}
+%{gem_dir}/cache/%{gem_name}-%{version}.gem
+%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
+/etc/openshift/plugins.d/openshift-origin-msg-broker-mcollective.conf.example
+
+%defattr(-,root,apache,-)
+%attr(0644,-,-) %ghost /etc/mcollective/client.cfg
%changelog
-* Tue Nov 06 2012 Adam Miller <admiller at redhat.com> - 1.0.1-1
-- Updated to latest upstream
-
-* Fri Sep 07 2012 Adam Miller <admiller at redhat.com> - 0.1.1-9
-- Removed ghost perms on mcollective config, fixed in BZ#853574
-
-* Wed Aug 22 2012 Troy Dawson <tdawson at redhat.com> - 0.1.1-8
-- Renamed libraries to correct name
-
-* Wed Aug 22 2012 Troy Dawson <tdawson at redhat.com> - 0.1.1-7
-- Fixed ruby abi requires
-
-* Tue Aug 21 2012 Troy Dawson <tdawson at redhat.com> - 0.1.1-6
-- Switched over to build from a gem
-
-* Fri Aug 17 2012 Adam Miller <admiller at redhat.com> - 0.1.1-5
-- Removed unneeded ruby_sitelib
-- moved license and readme to original location
-- removed policycoreutils-python and selinux-policy-targeted as deps
-- changed stickshift-common dep to openshift-origin-common for F18 pkg naming
-- added doc subpackage
-
-* Thu Aug 16 2012 Adam Miller <admiller at redhat.com> - 0.1.1-4
-- Removed buildroot, clean, and defattrs
-- using the gem macros defined
-
-* Tue Aug 07 2012 Adam Miller <admiller at redhat.com> - 0.1.1-3
-- Removed heredoc, added as patch/file, relayed upstream RH BZ#846407
-- fixed persmissions of ghost config file
-
-* Wed Aug 01 2012 Adam Miller <admiller at redhat.com> 0.1.1-2
-- rename for Fedora
-
-* Wed Jul 11 2012 Adam Miller <admiller at redhat.com> 0.1.1-1
-- bump_minor_versions for sprint 15 (admiller at redhat.com)
-
-* Wed Jul 11 2012 Adam Miller <admiller at redhat.com> 0.0.9-1
-- mcollective-plugin pkg doesn't require qpid-cpp-server or mcollective, only
- -client (admiller at redhat.com)
-
-* Tue Jul 10 2012 Adam Miller <admiller at redhat.com> 0.0.8-1
-- Merge pull request #211 from kraman/dev/kraman/bugs/835489
- (dmcphers at redhat.com)
-- Add modify application dns and use where applicable (dmcphers at redhat.com)
-- Bugz 835489. Fixing location for district config file and adding in missing
- node_profile_enabled blocks (kraman at gmail.com)
-
-* Tue Jul 10 2012 Adam Miller <admiller at redhat.com> - 0.0.7-2
-- Update spec file for RHEL6+Fedora16 as well as Fedora17+
-
-* Tue Jul 10 2012 Adam Miller <admiller at redhat.com> 0.0.7-1
-- Bug 838786 (dmcphers at redhat.com)
-
-* Mon Jul 09 2012 Dan McPherson <dmcphers at redhat.com> 0.0.6-1
-- cleanup specs (dmcphers at redhat.com)
-
-* Mon Jul 09 2012 Dan McPherson <dmcphers at redhat.com> 0.0.5-1
-- fix for bug#837579 - handle better messaging on find_available_node failure
- (rchopra at redhat.com)
-
-* Thu Jul 05 2012 Adam Miller <admiller at redhat.com> 0.0.4-1
-- Fix for BZ 837522. (mpatel at redhat.com)
-
-* Tue Jul 03 2012 Adam Miller <admiller at redhat.com> 0.0.3-1
-- fixed a couple typos (admiller at redhat.com)
-- Automatic commit of package [rubygem-gearchanger-mcollective-plugin] release
- [0.0.1-1]. (kraman at gmail.com)
-- Fix typo and remove dependency. (mpatel at redhat.com)
-- MCollective updates - Added mcollective-qpid plugin - Added mcollective-
- gearchanger plugin - Added mcollective agent and facter plugins - Added
- option to support ignoring node profile - Added systemu dependency for
- mcollective-client (kraman at gmail.com)
-
-* Tue Jul 03 2012 Adam Miller <admiller at redhat.com>
-- fixed a couple typos (admiller at redhat.com)
-- Automatic commit of package [rubygem-gearchanger-mcollective-plugin] release
- [0.0.1-1]. (kraman at gmail.com)
-- Fix typo and remove dependency. (mpatel at redhat.com)
-- MCollective updates - Added mcollective-qpid plugin - Added mcollective-
- gearchanger plugin - Added mcollective agent and facter plugins - Added
- option to support ignoring node profile - Added systemu dependency for
- mcollective-client (kraman at gmail.com)
+* Thu Dec 06 2012 Troy Dawson <tdawson at redhat.com> 1.1.6-2
+- Changed source from tar to gem
+
+* Mon Nov 26 2012 Adam Miller <admiller at redhat.com> 1.1.6-1
+- Changing same uid move to rsync (dmcphers at redhat.com)
+
+* Mon Nov 19 2012 Adam Miller <admiller at redhat.com> 1.1.5-1
+- add obsoletes (dmcphers at redhat.com)
+
+* Fri Nov 16 2012 Adam Miller <admiller at redhat.com> 1.1.4-1
+- Bug 876459 (dmcphers at redhat.com)
+
+* Thu Nov 15 2012 Adam Miller <admiller at redhat.com> 1.1.3-1
+- Merge pull request #897 from sosiouxme/BZ876271 (openshift+bot at redhat.com)
+- fix for bug#876458 (rchopra at redhat.com)
+- comment and set correct defaults in openshift-origin-msg-broker-
+ mcollective.conf.example (lmeyer at redhat.com)
+
+* Wed Nov 14 2012 Adam Miller <admiller at redhat.com> 1.1.2-1
+- add config to gemspec (dmcphers at redhat.com)
+- Moving plugins to Rails 3.2.8 engine (kraman at gmail.com)
+- getting specs up to 1.9 sclized (dmcphers at redhat.com)
+- specifying rake gem version range (abhgupta at redhat.com)
+
+* Thu Nov 08 2012 Adam Miller <admiller at redhat.com> 1.1.1-1
+- Bumping specs to at least 1.1 (dmcphers at redhat.com)
+* Tue Oct 30 2012 Adam Miller <admiller at redhat.com> 1.0.1-1
+- bumping specs to at least 1.0.0 (dmcphers at redhat.com)
diff --git a/sources b/sources
index 1347c25..b9b738f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a876d08537a2849ad10f18121db9cc0 openshift-origin-msg-broker-mcollective-1.0.1.gem
+15246374f7d23119a88f4e241ee1edda openshift-origin-msg-broker-mcollective-1.1.6.gem
More information about the scm-commits
mailing list