Update to ActiveSupport 3.0.5

Remove Rake dependnecy
f38
Vít Ondruch 14 years ago
parent 46c6d662d5
commit 344cbba19b

@ -1,32 +0,0 @@
require 'rake/testtask'
require 'rake/gempackagetask'
task :default => :test
Rake::TestTask.new do |t|
t.libs << 'test'
t.pattern = 'test/**/*_test.rb'
t.warning = true
t.verbose = true
end
namespace :test do
Rake::TestTask.new(:isolated) do |t|
t.pattern = 'test/ts_isolated.rb'
end
end
# Create compressed packages
dist_dirs = [ "lib", "test"]
spec = eval(File.read('activesupport.gemspec'))
Rake::GemPackageTask.new(spec) do |p|
p.gem_spec = spec
end
desc "Release to gemcutter"
task :release => :package do
require 'rake/gemcutter'
Rake::Gemcutter::Tasks.new(spec).define
Rake::Task['gem:push'].invoke
end

@ -1,15 +0,0 @@
--- Rakefile.orig 2011-01-10 16:26:22.397963520 -0500
+++ Rakefile 2011-01-10 16:26:28.015963421 -0500
@@ -18,12 +18,6 @@ end
# Create compressed packages
dist_dirs = [ "lib", "test"]
-spec = eval(File.read('activesupport.gemspec'))
-
-Rake::GemPackageTask.new(spec) do |p|
- p.gem_spec = spec
-end
-
desc "Release to gemcutter"
task :release => :package do
require 'rake/gemcutter'

@ -7,29 +7,22 @@
Summary: Support and utility classes used by the Rails framework Summary: Support and utility classes used by the Rails framework
Name: rubygem-%{gemname} Name: rubygem-%{gemname}
Epoch: 1 Epoch: 1
Version: 3.0.3 Version: 3.0.5
Release: 4%{?dist} Release: 1%{?dist}
Group: Development/Languages Group: Development/Languages
License: MIT License: MIT
URL: http://www.rubyonrails.org URL: http://www.rubyonrails.org
Source0: http://rubygems.org/downloads/activesupport-%{version}.gem Source0: http://rubygems.org/downloads/activesupport-%{version}.gem
# For some reason the activesupport doesn't ship with the upstream Rakefile
Source1: http://github.com/rails/rails/raw/v%{version}/%{gemname}/Rakefile
# Also the activesupport gem doesn't ship with the test suite like the other # Also the activesupport gem doesn't ship with the test suite like the other
# Rails rpms, you may check it out like so # Rails rpms, you may check it out like so
# git clone http://github.com/rails/rails.git # git clone http://github.com/rails/rails.git
# cd rails/activesupport/ # cd rails/activesupport/
# git checkout v3.0.3 # git checkout v3.0.5
# tar czvf activesupport-tests.tgz test/ # tar czvf activesupport-tests.tgz test/
Source2: activesupport-tests.tgz Source2: activesupport-tests.tgz
# Remove a task which breaks the Rakefile due to the gemspec
# not being present in the gem
Patch0: activesupport-rakefile-fix.patch
# Removes code which breaks the test suite due to a # Removes code which breaks the test suite due to a
# dependency on a file in the greater rails proj # dependency on a file in the greater rails proj
Patch1: activesupport-tests-fix.patch Patch1: activesupport-tests-fix.patch
@ -43,7 +36,6 @@ Requires: rubygems
Requires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(i18n) Requires: rubygem(i18n)
BuildRequires: rubygems BuildRequires: rubygems
BuildRequires: rubygem(rake)
BuildRequires: rubygem(mocha) BuildRequires: rubygem(mocha)
BuildRequires: rubygem(i18n) BuildRequires: rubygem(i18n)
#BuildRequires: rubygem(memcache-client) #BuildRequires: rubygem(memcache-client)
@ -63,15 +55,11 @@ mkdir -p .%{gemdir}
gem install --local --install-dir .%{gemdir} \ gem install --local --install-dir .%{gemdir} \
--force -V --rdoc %{SOURCE0} --force -V --rdoc %{SOURCE0}
# move the rakefile in place
cp %{SOURCE1} .%{geminstdir}
# move the tests into place # move the tests into place
tar xzvf %{SOURCE2} -C .%{geminstdir} tar xzvf %{SOURCE2} -C .%{geminstdir}
pushd .%{geminstdir} pushd .%{geminstdir}
%patch0 -p0
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
@ -87,13 +75,13 @@ rm -rf %{buildroot}
%check %check
pushd %{buildroot}%{geminstdir} pushd %{buildroot}%{geminstdir}
rake test RUBYOPT="Itest" ruby -e "Dir.glob('test/**/*_test.rb').each {|t| require t}"
popd
%files %files
%defattr(-, root, root, -) %defattr(-, root, root, -)
%dir %{geminstdir} %dir %{geminstdir}
%doc %{geminstdir}/CHANGELOG %doc %{geminstdir}/CHANGELOG
%{geminstdir}/Rakefile
%{geminstdir}/lib %{geminstdir}/lib
%doc %{geminstdir}/README.rdoc %doc %{geminstdir}/README.rdoc
%doc %{gemdir}/doc/%{gemname}-%{version} %doc %{gemdir}/doc/%{gemname}-%{version}
@ -103,6 +91,10 @@ rake test
%changelog %changelog
* Thu Mar 24 2011 Vít Ondruch <vondruch@redhat.com> - 1:3.0.3-5
- Update to ActiveSupport 3.0.5
- Remove Rake dependnecy
* Mon Feb 14 2011 Mohammed Morsi <mmorsi@redhat.com> - 1:3.0.3-4 * Mon Feb 14 2011 Mohammed Morsi <mmorsi@redhat.com> - 1:3.0.3-4
- fix bad dates in the spec changelog - fix bad dates in the spec changelog

Loading…
Cancel
Save