[rubygem-openshift-origin-msg-broker-mcollective] Revert "Update to latest upstream (1.0.1) - remove old defunct selinux rules" Wrong package ... I wa
Adam Miller
maxamillion at fedoraproject.org
Tue Nov 6 16:32:15 UTC 2012
commit 071fd4eda1756ac96fea1c62e8806445fed9f21a
Author: Adam Miller <admiller at redhat.com>
Date: Tue Nov 6 10:31:40 2012 -0600
Revert "Update to latest upstream (1.0.1) - remove old defunct selinux rules"
Wrong package ... I was in wrong dir in ~/fedpkg/ on my machine.
This reverts commit c8b9b385e34dbbafe9505cee10a7de7dfd1c0c81.
.gitignore | 1 -
config-gearchanger-mcollective-plugin.rb | 20 ++
rubygem-openshift-origin-common.spec | 142 ---------------
...-origin-msg-broker-mcollective-rename-fix.patch | 7 +
...em-openshift-origin-msg-broker-mcollective.spec | 184 ++++++++++++++++++++
sources | 2 +-
6 files changed, 212 insertions(+), 144 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ef70e8..d38bcef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
/openshift-origin-msg-broker-mcollective-0.1.1.gem
-/openshift-origin-common-1.0.1.gem
diff --git a/config-gearchanger-mcollective-plugin.rb b/config-gearchanger-mcollective-plugin.rb
new file mode 100644
index 0000000..d71822c
--- /dev/null
+++ b/config-gearchanger-mcollective-plugin.rb
@@ -0,0 +1,20 @@
+Broker::Application.configure do
+ config.gearchanger = {
+ :rpc_options => {
+ :disctimeout => 5,
+ :timeout => 60,
+ :verbose => false,
+ :progress_bar => false,
+ :filter => {"identity" => [], "fact" => [], "agent" => [], "cf_class" => []},
+ :config => "/etc/mcollective/client.cfg"
+ },
+ :districts => {
+ :enabled => false,
+ :require_for_app_create => false,
+ :max_capacity => 6000, #Only used by district create
+ :first_uid => 1000
+ },
+ :node_profile_enabled => false
+ }
+end
+
diff --git a/rubygem-openshift-origin-msg-broker-mcollective-rename-fix.patch b/rubygem-openshift-origin-msg-broker-mcollective-rename-fix.patch
new file mode 100644
index 0000000..8711fdc
--- /dev/null
+++ b/rubygem-openshift-origin-msg-broker-mcollective-rename-fix.patch
@@ -0,0 +1,7 @@
+--- openshift-origin-msg-broker-mcollective-0.1.1/lib/gearchanger-mcollective-plugin.rb 2012-08-22 13:31:45.332121163 -0400
++++ openshift-origin-msg-broker-mcollective-0.1.1.new/lib/gearchanger-mcollective-plugin.rb 2012-08-22 13:32:16.611123163 -0400
+@@ -1,3 +1,3 @@
+-require "stickshift-common"
++require "openshift-origin-common"
+ require "gearchanger-mcollective-plugin/gearchanger/mcollective_application_container_proxy.rb"
+ StickShift::ApplicationContainerProxy.provider=GearChanger::MCollectiveApplicationContainerProxy
diff --git a/rubygem-openshift-origin-msg-broker-mcollective.spec b/rubygem-openshift-origin-msg-broker-mcollective.spec
new file mode 100644
index 0000000..c567137
--- /dev/null
+++ b/rubygem-openshift-origin-msg-broker-mcollective.spec
@@ -0,0 +1,184 @@
+%global gem_name openshift-origin-msg-broker-mcollective
+
+%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
+Name: rubygem-%{gem_name}
+Version: 0.1.1
+Release: 9%{?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
+# The original upstream spec file contained a heredoc that populated a config
+# file that is actually ruby code. This file is simply the contents of that
+# heredoc and the following bug has been filed to have this fixed upstream:
+# https://bugzilla.redhat.com/show_bug.cgi?id=846407
+Source1: config-gearchanger-mcollective-plugin.rb
+# Renaming patch, will go upstream with renaming push
+Patch0: rubygem-openshift-origin-msg-broker-mcollective-rename-fix.patch
+
+%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
+Requires: mcollective-client
+Requires: qpid-cpp-server
+Requires: qpid-cpp-client
+Requires: ruby-qpid
+#Requires: qpid-tools
+Requires: rubygem(openshift-origin-common)
+Requires: rubygem(json)
+
+%if 0%{?fedora} >= 17
+BuildRequires: rubygems-devel
+%endif
+BuildRequires: ruby
+BuildRequires: rubygems
+BuildArch: noarch
+Provides: rubygem(%{gem_name}) = %version
+
+%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
+
+%prep
+gem unpack %{SOURCE0}
+%setup -q -D -T -n %{gem_name}-%{version}
+%patch0 -p1
+
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+# rename lib to correct name
+mv lib/gearchanger-mcollective-plugin.rb lib/openshift-origin-msg-broker-mcollective.rb
+sed -i -e 's|\"lib/gearchanger-mcollective-plugin.rb\"|\"lib/openshift-origin-msg-broker-mcollective.rb\"|' %{gem_name}.gemspec
+
+%build
+# 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
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
+
+mkdir -p %{buildroot}%{_var}/www/stickshift/broker/config/environments/plugin-config
+install -m0644 %{SOURCE1} %{buildroot}%{_var}/www/stickshift/broker/config/environments/plugin-config/gearchanger-mcollective-plugin.rb
+
+%files
+%doc %{gem_instdir}/Gemfile
+%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/COPYRIGHT
+%{gem_instdir}
+%{gem_cache}
+%{gem_spec}
+%{_var}/www/stickshift/broker/config/environments/plugin-config/gearchanger-mcollective-plugin.rb
+
+%files doc
+%{gem_docdir}
+
+%changelog
+* 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)
+
diff --git a/sources b/sources
index ceb8fa3..5202615 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-330b45dc7e6fc0044d21b9db8c18acb8 openshift-origin-common-1.0.1.gem
+c8d7cb3ce200f59688e4f3ca1501afcf openshift-origin-msg-broker-mcollective-0.1.1.gem
More information about the scm-commits
mailing list