[rubygem-openshift-origin-node] update to 1.1.7
tdawson
tdawson at fedoraproject.org
Tue Dec 4 21:22:17 UTC 2012
commit 9c0622115b521cb218032c9a7b85d0633b70eccd
Author: Troy Dawson <tdawson at redhat.com>
Date: Tue Dec 4 15:22:11 2012 -0600
update to 1.1.7
.gitignore | 1 +
..._node.conf => 000001_openshift_origin_node.conf | 3 +-
openshift-origin-node_gemspec_fixes.patch | 12 -
openshift-origin-node_shebang_fix.patch | 8 -
openshift-origin-node_version_fix.patch | 11 -
rubygem-openshift-origin-node.spec | 297 +++++++++++---------
sources | 2 +-
7 files changed, 169 insertions(+), 165 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d763f11..55437f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openshift-origin-node-0.14.6.gem
+/openshift-origin-node-1.1.7.gem
diff --git a/000001_stickshift_node.conf b/000001_openshift_origin_node.conf
similarity index 94%
rename from 000001_stickshift_node.conf
rename to 000001_openshift_origin_node.conf
index 0666705..ab2f7d9 100644
--- a/000001_stickshift_node.conf
+++ b/000001_openshift_origin_node.conf
@@ -27,5 +27,6 @@ NameVirtualHost *:80
NameVirtualHost *:443
ProxyPreserveHost On
RequestHeader unset X-Forwarded-For
+TraceEnable off
-include conf.d/stickshift/*.conf
+include conf.d/openshift/*.conf
diff --git a/rubygem-openshift-origin-node.spec b/rubygem-openshift-origin-node.spec
index ea6ef0c..556da6b 100644
--- a/rubygem-openshift-origin-node.spec
+++ b/rubygem-openshift-origin-node.spec
@@ -1,78 +1,69 @@
+%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-node
+%global rubyabi 1.9.1
-# Conditionally set required macros for distros without rubygems-devel This can
-# be removed once https://bugzilla.redhat.com/show_bug.cgi?id=788001 is
-# resolved.
-%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
-%{!?gem_instdir: %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}}
-
-# Used for openshift.com only default to False
-%global hosted 0
+%global appdir %{_var}/lib/openshift
+%global apprundir %{_var}/run/openshift
-%global appdir %{_localstatedir}/lib/stickshift
-
-Summary: Application container runtime for OpenShift
+Summary: Cloud Development Node
Name: rubygem-%{gem_name}
-Version: 0.14.6
-Release: 6%{?dist}
-Group: Development/Tools
+Version: 1.1.7
+Release: 2%{?dist}
+Group: Development/Languages
License: ASL 2.0
URL: http://openshift.redhat.com
-Source0: https://mirror.openshift.com/pub/openshift-origin/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
-Source1: 000001_stickshift_node.conf
-# https://github.com/openshift/crankcase/pull/347
-Patch0: openshift-origin-node_shebang_fix.patch
-# https://github.com/openshift/crankcase/pull/357
-Patch1: openshift-origin-node_gemspec_fixes.patch
-# Renaming patch, will go upstream with renaming push
-Patch2: openshift-origin-node_version_fix.patch
-Requires: httpd
-Requires: ruby(abi) >= 1.8
-Requires: rubygems
-Requires: rubygem(json)
-Requires: rubygem(parseconfig)
+Source0: https://mirror.openshift.com/pub/origin-server/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
+Source1: 000001_openshift_origin_node.conf
+Requires: %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+Requires: %{?scl:%scl_prefix}ruby
+Requires: %{?scl:%scl_prefix}rubygems
+Requires: %{?scl:%scl_prefix}rubygem(json)
+Requires: %{?scl:%scl_prefix}rubygem(parseconfig)
+Requires: %{?scl:%scl_prefix}rubygem(mocha)
+Requires: %{?scl:%scl_prefix}rubygem(rspec)
Requires: rubygem(openshift-origin-common)
-Requires: rubygem(rspec)
-Requires: rubygem(open4)
-Requires: rubygem(systemu)
Requires: python
-
-%if %{hosted}
+Requires: libselinux-python
Requires: mercurial
-%endif
-BuildRequires: ruby-devel
-%if 0%{?rhel} == 6
-BuildRequires: rubygems
+%if 0%{?fedora}%{?rhel} <= 6
+Requires: libcgroup
%else
-BuildRequires: rubygems-devel
+Requires: libcgroup-tools
+%endif
+Requires: pam_openshift
+Requires: quota
+
+%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
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %version
+Obsoletes: rubygem-stickshift-node
%description
-The Node subsystem is a environment for running OpenShift Cartridges
-(application containers). User applications are securely sandboxed through
-SELinux and cgroups.
+This contains the Cloud Development Node packaged as a rubygem.
%prep
+%{?scl:scl enable %scl - << \EOF}
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
-%patch0 -p1
-%patch2 -p1
-
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
-# Note: The patching of the spec file must happen after the 'gem spec' command.
-%patch1 -p1
-
-# rename lib to correct name
-mv lib/stickshift-node.rb lib/openshift-origin-node.rb
-sed -i -e 's|\"lib/stickshift-node.rb\"|\"lib/openshift-origin-node.rb\"|' %{gem_name}.gemspec
+%{?scl:EOF}
%build
+%{?scl:scl enable %scl - << \EOF}
mkdir -p .%{gem_dir}
-
# Create the gem as gem install only works on a gem file
gem build %{gem_name}.gemspec
@@ -82,111 +73,153 @@ export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
# buildroot in %%install
gem install -V \
--local \
- --install-dir ./%{gem_dir} \
+ --install-dir .%{gem_dir} \
--bindir ./%{_bindir} \
--force \
--rdoc \
%{gem_name}-%{version}.gem
+%{?scl:EOF}
%install
mkdir -p %{buildroot}%{gem_dir}
cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
-rm %{buildroot}%{gem_dir}/cache/%{gem_name}-%{version}.gem
-rm -rf %{buildroot}%{gem_dir}/gems/%{gem_name}-%{version}/test
-# If there were programs installed:
-mkdir -p %{buildroot}%{_bindir}
-cp -a ./%{_bindir}/* %{buildroot}%{_bindir}
+# Move the gem binaries to the standard filesystem location
+mkdir -p %{buildroot}/usr/bin
+cp -a ./%{_bindir}/* %{buildroot}/usr/bin
-mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+mkdir -p %{buildroot}/etc/httpd/conf.d
mkdir -p %{buildroot}%{appdir}/.httpd.d
-ln -sf %{appdir}/.httpd.d %{buildroot}%{_sysconfdir}/httpd/conf.d/stickshift
+ln -sf %{appdir}/.httpd.d %{buildroot}/etc/httpd/conf.d/openshift
# Move the gem configs to the standard filesystem location
-mkdir -p %{buildroot}%{_sysconfdir}/stickshift
-mv %{buildroot}%{gem_instdir}/conf/* %{buildroot}%{_sysconfdir}/stickshift
+mkdir -p %{buildroot}/etc/openshift
+mv %{buildroot}%{gem_instdir}/conf/* %{buildroot}/etc/openshift
+
+#move pam limit binaries to proper location
+mkdir -p %{buildroot}/usr/libexec/openshift/lib
+mv %{buildroot}%{gem_instdir}/misc/bin/teardown_pam_fs_limits.sh %{buildroot}/usr/libexec/openshift/lib
+mv %{buildroot}%{gem_instdir}/misc/bin/setup_pam_fs_limits.sh %{buildroot}/usr/libexec/openshift/lib
#move the shell binaries into proper location
-mv %{buildroot}%{gem_instdir}/misc/bin/* %{buildroot}%{_bindir}/
-rm -rf %{buildroot}%{gem_instdir}/misc
+mv %{buildroot}%{gem_instdir}/misc/bin/* %{buildroot}/usr/bin/
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-sed -i 's/^include/IncludeOptional/' %{buildroot}%{_sysconfdir}/httpd/conf.d/000001_stickshift_node.conf
+# Create run dir for openshift "services"
+%if 0%{?fedora} >= 15
+mkdir -p %{buildroot}/etc/tmpfiles.d
+mv %{buildroot}%{gem_instdir}/misc/etc/openshift-run.conf %{buildroot}/etc/tmpfiles.d
+%else
+mkdir -p %{buildroot}%{apprundir}
+%endif
+# place an example file
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
+mv %{buildroot}%{gem_instdir}/misc/doc/cgconfig.conf %{buildroot}%{_docdir}/%{name}-%{version}/cgconfig.conf
-# https://github.com/openshift/crankcase/pull/347
-chmod 0644 %{buildroot}%{gem_dir}/gems/%{gem_name}-%{version}/lib/stickshift-node/model/unix_user.rb
+cp -p %{SOURCE1} %{buildroot}/etc/httpd/conf.d/000001_openshift_origin_node.conf
+# http 2.4.2 option change
+%if 0%{?fedora} >= 18
+sed -i 's/^include/IncludeOptional/' %{buildroot}%{_sysconfdir}/httpd/conf.d/000001_openshift_origin_node.conf
+%endif
+
+%if 0%{?fedora}%{?rhel} <= 6
+mkdir -p %{buildroot}/etc/rc.d/init.d/
+cp %{buildroot}%{gem_instdir}/misc/init/openshift-cgroups %{buildroot}/etc/rc.d/init.d/
+%else
+mkdir -p %{buildroot}/etc/systemd/system
+mv %{buildroot}%{gem_instdir}/misc/services/openshift-cgroups.service %{buildroot}/etc/systemd/system/openshift-cgroups.service
+%endif
+
+# Don't install or package what's left in the misc directory
+rm -rf %{buildroot}%{gem_instdir}/misc
%files
%doc LICENSE COPYRIGHT
-%{_bindir}/*
-%{gem_dir}/doc/%{gem_name}-%{version}
-%{gem_dir}/gems/%{gem_name}-%{version}
-%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
-%config(noreplace) %{_sysconfdir}/stickshift
-%config(noreplace) %attr(0750,-,-) %{_sysconfdir}/httpd/conf.d/stickshift
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/000001_stickshift_node.conf
-%attr(0755,-,-) %{_var}/lib/stickshift
-
-%post
-if [ $1 -ge 1 ] ; then # Handle first install and upgrade
- # No need to add this again if we're upgrading
- grep ss-trap-user /etc/shells
- [ $? -ne 0 ] && echo "/usr/bin/ss-trap-user" >> /etc/shells
+%doc %{gem_docdir}
+%{gem_instdir}
+%{gem_cache}
+%{gem_spec}
+/usr/bin/*
+/usr/libexec/openshift/lib/setup_pam_fs_limits.sh
+/usr/libexec/openshift/lib/teardown_pam_fs_limits.sh
+%config(noreplace) /etc/openshift
+/etc/httpd/conf.d/openshift
+
+%config(noreplace) /etc/httpd/conf.d/000001_openshift_origin_node.conf
+%attr(0755,-,-) %{appdir}
+
+%if 0%{?fedora}%{?rhel} <= 6
+%attr(0755,-,-) /etc/rc.d/init.d/openshift-cgroups
+%else
+%attr(0755,-,-) /etc/systemd/system/*
+%endif
- restorecon -r %{_var}/lib/stickshift
-fi
+%if 0%{?fedora} >= 15
+/etc/tmpfiles.d/openshift-run.conf
+%else
+# upstart files
+%attr(0755,-,-) %{_var}/run/openshift
+%endif
-%preun
-if [ $1 -eq 0 ] ; then # Final removal
- sed -i "/ss-trap-user/d" /etc/shells
+%post
+echo "/usr/bin/oo-trap-user" >> /etc/shells
- restorecon -r %{_var}/lib/stickshift
+# copying this file in the post hook so that this file can be replaced by rhc-node
+# copy this file only if it doesn't already exist
+if ! [ -f /etc/openshift/resource_limits.conf ]; then
+ cp -f /etc/openshift/resource_limits.template /etc/openshift/resource_limits.conf
fi
%changelog
-* Tue Oct 16 2012 Troy Dawson <tdawson at redhat.com> 0.14.6-6
-- Fixed 000001_stickshift_node.conf httpd 2.4 issues
-
-* Wed Aug 22 2012 Troy Dawson <tdawson at redhat.com> - 0.14.6-5
-- Renamed library to correct name
-- Fixed version.rb to ask for correct name
-- Added open4 and systemu as dependanies
-
-* Fri Aug 10 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.6-4
-- Added patch to fix project homepage
-
-* Mon Aug 06 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.6-3
-- Removed integration tests
-- Fixed file mode issues
-- Fixed usage of define
-- Added httpd require
-
-* Mon Aug 06 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.6-2
-- Removed unneeded BuildRoot tag
-- Removed unneeded clean section
-- Removed unneeded defattr usage
-- Removed unneeded cached gem
-- Fixed the Source0 URL
-- Reenabled restorecon calls in %post and %preun
-
-* Thu Aug 02 2012 Troy Dawson <tdawson at redhat.com> 0.14.6-1
-- Renamed package to openshift-origin-node
-- Updated to the latest upstream stable release
-- Added LICENSE and COPYRIGHT to doc
-
-* Fri Jul 20 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.2-1
-- Latest upstream release
-
-* Fri Jul 20 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.2-1
-- Latest upstream release
-- Switched Source0 to gem
-
-* Wed Jul 18 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.1-2
-- Added ruby-devel and rubygem-devel build requires and replaced the
- ruby_sitelib and geminstdir macros with the standard macros.
-- Renamed %%gemname to %%gem_name so %%geminstdir will work correctly.
-- Fixed several file mode problems with libraries
-
-* Mon Jul 12 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.14.1-1
-- Initial package creation for Fedora
+* Tue Dec 04 2012 Troy Dawson <tdawson at redhat.com> 1.1.7-2
+- Fixed source, change from tar to gem
+- added source1, not in the gem.
+- Fix http conf file to work with httpd 2.4.2+
+- clean up spec
+
+* Thu Nov 15 2012 Adam Miller <admiller at redhat.com> 1.1.7-1
+- BZ877125 - File attributes on open shift-cgroups init script are incorrect,
+ should be -rwxr-x--- (calfonso at redhat.com)
+- more ruby1.9 changes (dmcphers at redhat.com)
+
+* Wed Nov 14 2012 Adam Miller <admiller at redhat.com> 1.1.6-1
+- Ruby 1.9 compatibility fixes (ironcladlou at gmail.com)
+- getting specs up to 1.9 sclized (dmcphers at redhat.com)
+- Merge pull request #886 from rmillner/inhibitidler (dmcphers at redhat.com)
+- One of the SELinux denials was accessing the locale file via whois which is
+ unnecessary if accessing /etc directly. (rmillner at redhat.com)
+- specifying rake gem version range (abhgupta at redhat.com)
+
+* Tue Nov 13 2012 Adam Miller <admiller at redhat.com> 1.1.5-1
+- Merge remote-tracking branch 'origin-server/master' into BZ874587-origin
+ (bleanhar at redhat.com)
+- Merge pull request #881 from rmillner/wrongmcs (openshift+bot at redhat.com)
+- SS -> OPENSHIFT (dmcphers at redhat.com)
+- Was setting mcs label in the wrong place. (rmillner at redhat.com)
+- Fix for Bug 875949 (jhonce at redhat.com)
+- Bug 874587 - CLOUD_NAME in /etc/openshift/node.conf does not work
+ (bleanhar at redhat.com)
+
+* Mon Nov 12 2012 Adam Miller <admiller at redhat.com> 1.1.4-1
+- BZ 872379: Dead code cleanup to fix mount parsing problem.
+ (rmillner at redhat.com)
+
+* Thu Nov 08 2012 Adam Miller <admiller at redhat.com> 1.1.3-1
+- Merge pull request #857 from jwhonce/dev/bz874712_master
+ (openshift+bot at redhat.com)
+- Fix for Bug 874712 (jhonce at redhat.com)
+
+* Thu Nov 08 2012 Adam Miller <admiller at redhat.com> 1.1.2-1
+- Merge pull request #851 from brenton/no_trace (openshift+bot at redhat.com)
+- BZ873970, BZ873966 - disabling HTTP TRACE for the Broker, Nodes and Console
+ (bleanhar at redhat.com)
+- Increase the table sizes to cover 15000 nodes in dev and prod.
+ (rmillner at redhat.com)
+- BZ872523 - set quota for gear failed if the device name is too long
+ (bleanhar at redhat.com)
+- Merge pull request #698 from mscherer/fix_doc_node_bin
+ (openshift+bot at redhat.com)
+- do not use old name in the script help message (mscherer at redhat.com)
+
+* Thu Nov 01 2012 Adam Miller <admiller at redhat.com> 1.1.1-1
+- bump_minor_versions for sprint 20 (admiller at redhat.com)
diff --git a/sources b/sources
index ad91e05..27650b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0044069d45e0396a94adeda575454cbf openshift-origin-node-0.14.6.gem
+e90ac83320e45c3b5ff6ef87101539f1 openshift-origin-node-1.1.7.gem
More information about the scm-commits
mailing list