openstack
/
fuel-main
Code Issues Proposed changes

Change version rbenv-ruby to 1.9.3-p484 for centos65 

Partial-bug: #1294602
Closes-Bug: #1327010
Change-Id: Iba40083bf3fbabfe733f9f80823a99684c7873cf
This commit is contained in:
Sergey Otpuschennikov 2014-03-18 18:25:51 +04:00 committed by Dmitry Burmistrov
parent f48918965b
commit 1e0f6790c4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/rpm/module.mk
View File

@ -112,12 +112,12 @@ $(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: export SANDBOX_UP:=$(SANDBOX_UP)
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: \
$(BUILD_DIR)/packages/rpm/prep.done \
$(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec
$(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p484.spec
sudo sh -c "$${SANDBOX_UP}"
sudo mkdir -p $(SANDBOX)/tmp/SOURCES
sudo cp $(LOCAL_MIRROR_SRC)/* $(SANDBOX)/tmp/SOURCES
sudo cp $(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec $(SANDBOX)/tmp
sudo chroot $(SANDBOX) rpmbuild -vv --define "_topdir /tmp" -ba /tmp/rbenv-ruby-1.9.3-p392.spec
sudo cp $(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p484.spec $(SANDBOX)/tmp
sudo chroot $(SANDBOX) rpmbuild -vv --define "_topdir /tmp" -ba /tmp/rbenv-ruby-1.9.3-p484.spec
cp $(SANDBOX)/tmp/RPMS/x86_64/rbenv-ruby-*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64/
sudo sh -c "$${SANDBOX_DOWN}"
$(ACTION.TOUCH)

12
packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec → packages/rpm/specs/rbenv-ruby-1.9.3-p484.spec
View File

@ -1,12 +1,12 @@
Name: rbenv-ruby-1.9.3-p392
Summary: Ruby 1.9.3-p392 inside rbenv environment
Name: rbenv-ruby-1.9.3-p484
Summary: Ruby 1.9.3-p484 inside rbenv environment
Version: 0.0.1
Release: 1
License: Ruby
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
URL: http://mirantis.com
%description
Ruby 1.9.3-p392 inside rbenv environment
Ruby 1.9.3-p484 inside rbenv environment
%prep
rm -rf "%{name}-%{version}"
@ -14,14 +14,14 @@ mkdir %{name}-%{version}
cd %{name}-%{version}
unzip -q %{_sourcedir}/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip
mv -f rbenv-382db59cd0c16518d0cec0974e220a2c46aa7a25 rbenv
unzip -q %{_sourcedir}/1fb955eead087646f4d73ac36786432c380309a9.zip
mv -f ruby-build-1fb955eead087646f4d73ac36786432c380309a9 ruby-build
unzip -q %{_sourcedir}/5ae03b839494d20435faad5bc31e2e95d10c4f33.zip
mv -f ruby-build-5ae03b839494d20435faad5bc31e2e95d10c4f33 ruby-build
ln -fs `pwd`/rbenv /opt
%build
cd %{name}-%{version}
echo "system" > rbenv/version
RUBY_BUILD_CACHE_PATH=%{_sourcedir} ruby-build/bin/ruby-build 1.9.3-p392 /opt/rbenv/versions/1.9.3-p392
RUBY_BUILD_CACHE_PATH=%{_sourcedir} ruby-build/bin/ruby-build 1.9.3-p484 /opt/rbenv/versions/1.9.3-p484
%install
mkdir -p %{buildroot}/opt/

4
requirements-src.txt
View File

@ -3,8 +3,8 @@ http://pypcap.googlecode.com/files/pypcap-1.1.tar.gz
http://osci-obs.vm.mirantis.net:82/centos-fuel-4.1.1-stable/b78eaae57c8e836b8018386dd96527b8d9971acc.zip
http://download.mirantis.com/fuelweb-gems/gems/mcollective-client-2.3.3.gem
https://github.com/sstephenson/rbenv/archive/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip
https://github.com/sstephenson/ruby-build/archive/1fb955eead087646f4d73ac36786432c380309a9.zip
https://github.com/sstephenson/ruby-build/archive/5ae03b839494d20435faad5bc31e2e95d10c4f33.zip
http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p392.tar.gz
http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p484.tar.gz
https://github.com/liftoff/GateOne/archive/bb003114b4e84e9425fd02fd1ee615d4dd2113e7.zip
https://github.com/e0ne/python-heatclient/archive/7685f8ac19482086f72d6d733fc21a31c5e35d16.zip