packages: ruby-activesupport2/ruby-activesupport2.spec, ruby-activesupport2...
baggins
baggins at pld-linux.org
Wed Jun 22 12:51:30 CEST 2011
Author: baggins Date: Wed Jun 22 10:51:30 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 2.3.5 as separate package (needed by redmine)
---- Files affected:
packages/ruby-activesupport2:
ruby-activesupport2.spec (1.31 -> 1.32) , ruby-activesupport-nogems.patch (1.4 -> 1.5) , ruby-activesupport-thread.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/ruby-activesupport2/ruby-activesupport2.spec
diff -u packages/ruby-activesupport2/ruby-activesupport2.spec:1.31 packages/ruby-activesupport2/ruby-activesupport2.spec:1.32
--- packages/ruby-activesupport2/ruby-activesupport2.spec:1.31 Tue Nov 30 23:19:07 2010
+++ packages/ruby-activesupport2/ruby-activesupport2.spec Wed Jun 22 12:51:24 2011
@@ -2,12 +2,14 @@
%define pkgname activesupport
Summary: Utility libraries for Ruby on Rails
Name: ruby-%{pkgname}
-Version: 3.0.3
+Version: 2.3.5
Release: 1
License: Ruby-alike
Group: Development/Languages
Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5: 474ab3e5963afdad6a9c6c66ff08b16d
+# Source0-md5: c4cbb7dd1ea612fd1c6b181a211cd468
+Patch0: %{name}-nogems.patch
+Patch1: %{name}-thread.patch
URL: http://rubyforge.org/projects/activesupport/
BuildRequires: rpmbuild(macros) >= 1.277
BuildRequires: ruby >= 1:1.8.6
@@ -61,6 +63,11 @@
%prep
%setup -q -c
%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README -o -print | xargs touch --reference %{SOURCE0}
+%patch0 -p1
+%patch1 -p1
+
+%{__rm} -r lib/active_support/vendor*
# JRuby crap
rm lib/active_support/xml_mini/jdom.rb
@@ -70,10 +77,10 @@
rdoc --op rdoc lib
rm ri/created.rid
rm -r ri/{CGI,Class,ClassInheritableAttributes,Date,DateTime} \
- ri/{Enumerable,FalseClass,File,Float,Hash} \
- ri/{Integer,Kernel,Logger} \
- ri/{LibXML,Module,NameError,NilClass,Numeric} \
- ri/{Object,Proc,Range,Regexp,REXML,String} \
+ ri/{Enumerable,Exception,FalseClass,File,Float,Hash} \
+ ri/{HashWithIndifferentAccess,Integer,Kernel,Logger} \
+ ri/{LibXML,MissingSourceFile,Module,NameError,NilClass,Numeric} \
+ ri/{Object,Pathname,Proc,Range,Regexp,REXML,String} \
ri/{Symbol,Test,Time,TrueClass,Process,Array,BigDecimal}
%install
@@ -92,6 +99,7 @@
%doc CHANGELOG
%{ruby_rubylibdir}/active_support
%{ruby_rubylibdir}/active_support.rb
+%{ruby_rubylibdir}/activesupport.rb
%files rdoc
%defattr(644,root,root,755)
@@ -107,6 +115,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2011/06/22 10:51:24 baggins
+- 2.3.5 as separate package (needed by redmine)
+
Revision 1.31 2010/11/30 22:19:07 aredridel
- up to 3.0.3
================================================================
Index: packages/ruby-activesupport2/ruby-activesupport-nogems.patch
diff -u /dev/null packages/ruby-activesupport2/ruby-activesupport-nogems.patch:1.5
--- /dev/null Wed Jun 22 12:51:30 2011
+++ packages/ruby-activesupport2/ruby-activesupport-nogems.patch Wed Jun 22 12:51:24 2011
@@ -0,0 +1,62 @@
+diff --git a/lib/active_support.rb b/lib/active_support.rb
+index 7ebb3c4..63c76cc 100644
+--- a/lib/active_support.rb
++++ b/lib/active_support.rb
+@@ -51,7 +51,7 @@ module ActiveSupport
+ autoload :XmlMini, 'active_support/xml_mini'
+ end
+
+-require 'active_support/vendor'
++require 'i18n'
+ require 'active_support/core_ext'
+ require 'active_support/dependencies'
+ require 'active_support/json'
+diff --git a/lib/active_support/json/encoding.rb b/lib/active_support/json/encoding.rb
+index ffd2050..7b30ee8 100644
+--- a/lib/active_support/json/encoding.rb
++++ b/lib/active_support/json/encoding.rb
+@@ -81,10 +81,7 @@ module ActiveSupport
+ end
+
+ # Hack to load json gem first so we can overwrite its to_json.
+-begin
+ require 'json'
+-rescue LoadError
+-end
+
+ require 'active_support/json/variable'
+ require 'active_support/json/encoders/date'
+diff --git a/lib/active_support/test_case.rb b/lib/active_support/test_case.rb
+index bde74fa..8421241 100644
+--- a/lib/active_support/test_case.rb
++++ b/lib/active_support/test_case.rb
+@@ -5,7 +5,6 @@ require 'active_support/testing/deprecation'
+ require 'active_support/testing/declarative'
+
+ begin
+- gem 'mocha', ">= 0.9.7"
+ require 'mocha'
+ rescue LoadError
+ # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
+diff --git a/lib/active_support/testing/performance.rb b/lib/active_support/testing/performance.rb
+index f8d12e8..38837a3 100644
+--- a/lib/active_support/testing/performance.rb
++++ b/lib/active_support/testing/performance.rb
+@@ -1,9 +1,6 @@
+-require 'rubygems'
+-gem 'ruby-prof', '>= 0.6.1'
+ require 'ruby-prof'
+
+ require 'fileutils'
+-require 'rails/version'
+
+ module ActiveSupport
+ module Testing
+@@ -124,6 +121,7 @@ module ActiveSupport
+
+ def environment
+ unless defined? @env
++ require 'rails/version'
+ app = "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
+
+ rails = Rails::VERSION::STRING
================================================================
Index: packages/ruby-activesupport2/ruby-activesupport-thread.patch
diff -u /dev/null packages/ruby-activesupport2/ruby-activesupport-thread.patch:1.3
--- /dev/null Wed Jun 22 12:51:30 2011
+++ packages/ruby-activesupport2/ruby-activesupport-thread.patch Wed Jun 22 12:51:24 2011
@@ -0,0 +1,9 @@
+diff -ur ruby-activesupport-2.3.5-o//lib/active_support/dependencies.rb ruby-activesupport-2.3.5/lib/active_support/dependencies.rb
+--- ruby-activesupport-2.3.5-o//lib/active_support/dependencies.rb 2010-03-19 09:04:11.000000000 +0100
++++ ruby-activesupport-2.3.5/lib/active_support/dependencies.rb 2010-11-23 18:01:20.000000000 +0100
+@@ -1,3 +1,4 @@
++require 'thread'
+ module ActiveSupport #:nodoc:
+ module Dependencies #:nodoc:
+ extend self
+Only in ruby-activesupport-2.3.5/lib/active_support: dependencies.rb~
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activesupport2/ruby-activesupport2.spec?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activesupport2/ruby-activesupport-nogems.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activesupport2/ruby-activesupport-thread.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list