packages: ruby-activesupport/ruby-activesupport-nogems.patch, ruby-activesu...

baggins baggins at pld-linux.org
Mon Mar 1 01:05:24 CET 2010


Author: baggins                      Date: Mon Mar  1 00:05:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.3.5

---- Files affected:
packages/ruby-activesupport:
   ruby-activesupport-nogems.patch (1.2 -> 1.3) , ruby-activesupport.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/ruby-activesupport/ruby-activesupport-nogems.patch
diff -u packages/ruby-activesupport/ruby-activesupport-nogems.patch:1.2 packages/ruby-activesupport/ruby-activesupport-nogems.patch:1.3
--- packages/ruby-activesupport/ruby-activesupport-nogems.patch:1.2	Thu Sep 18 02:02:30 2008
+++ packages/ruby-activesupport/ruby-activesupport-nogems.patch	Mon Mar  1 01:05:18 2010
@@ -1,30 +1,62 @@
-diff -Nur activesupport-2.0.1.orig/lib/active_support/vendor.rb activesupport-2.0.1.nogems/lib/active_support/vendor.rb
---- activesupport-2.0.1.orig/lib/active_support/vendor.rb	2007-10-10 17:01:41.000000000 -0600
-+++ activesupport-2.0.1.nogems/lib/active_support/vendor.rb	2008-09-17 17:55:19.000000000 -0600
-@@ -1,14 +1 @@
- # Prefer gems to the bundled libs.
--require 'rubygems'
--
--begin
--  gem 'builder', '~> 2.1.2'
--rescue Gem::LoadError
--  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
--end
--
+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
--  gem 'xml-simple', '~> 1.0.11'
--rescue Gem::LoadError
--  $:.unshift "#{File.dirname(__FILE__)}/vendor/xml-simple-1.0.11"
+   require 'json'
+-rescue LoadError
 -end
-diff -Nur activesupport-2.0.1.orig/lib/active_support.rb activesupport-2.0.1.nogems/lib/active_support.rb
---- activesupport-2.0.1.orig/lib/active_support.rb	2007-10-25 20:21:21.000000000 -0600
-+++ activesupport-2.0.1.nogems/lib/active_support.rb	2008-09-17 17:55:33.000000000 -0600
-@@ -21,8 +21,6 @@
- # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #++
- 
--$:.unshift(File.dirname(__FILE__))
--
- require 'active_support/vendor'
- require 'active_support/basic_object'
- require 'active_support/inflector'
+ 
+ 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-activesupport/ruby-activesupport.spec
diff -u packages/ruby-activesupport/ruby-activesupport.spec:1.27 packages/ruby-activesupport/ruby-activesupport.spec:1.28
--- packages/ruby-activesupport/ruby-activesupport.spec:1.27	Sat Feb 27 20:19:08 2010
+++ packages/ruby-activesupport/ruby-activesupport.spec	Mon Mar  1 01:05:18 2010
@@ -1,27 +1,26 @@
 # $Revision$, $Date$
-# TODO
-# - get rid of internal pkgs?
-#  vendor/builder-2.1.2
-#  vendor/xml-simple-1.0.11
-#  vendor/xml-simple-1.0.11
 %define pkgname activesupport
 Summary:	Utility libraries for Ruby on Rails
 Name:		ruby-%{pkgname}
-Version:	2.0.5
+Version:	2.3.5
 Release:	1
 License:	Ruby-alike
 Group:		Development/Languages
-Source0:	http://rubyforge.org/frs/download.php/45353/%{pkgname}-%{version}.tgz
-# Source0-md5:	662a9b2a43c43ed76bb422fe884f8699
+Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5:	c4cbb7dd1ea612fd1c6b181a211cd468
 Patch0:		%{name}-nogems.patch
 URL:		http://rubyforge.org/projects/activesupport/
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby >= 1:1.8.6
 BuildRequires:	ruby-modules
 %{?ruby_mod_ver_requires_eq}
-Requires:	ruby-breakpoint
 Requires:	ruby-builder >= 2.1.2
-Requires:	ruby-xml-simple >= 1.0.11
+Requires:	ruby-i18n
+Requires:	ruby-json
+Requires:	ruby-mocha >= 0.9.7
+Requires:	ruby-memcache-client
+Requires:	ruby-nokogiri >= 1.1.1
+Requires:	ruby-tzinfo
 Obsoletes:	ruby-ActiveSupport
 Provides:	ruby-ActiveSupport
 #BuildArch:	noarch
@@ -49,52 +48,26 @@
 Dokumentacja do biblioteki ActiveSupport.
 
 %prep
-%setup -q -n activesupport-%{version}
+%setup -q -c
+%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README  -o -print | xargs touch --reference %{SOURCE0}
 %patch0 -p1
 
-%{__rm} -r lib/active_support/vendor
+%{__rm} -rf lib/active_support/vendor*
+
+# JRuby crap
+rm -f lib/active_support/xml_mini/jdom.rb
 
 %build
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 rm -f ri/created.rid
-# external packages?
-rm -rf ri/CGI
-rm -rf ri/Class
-rm -rf ri/ClassInheritableAttributes
-rm -rf ri/Date
-rm -rf ri/DateTime
-rm -rf ri/Dependencies
-rm -rf ri/Enumerable
-rm -rf ri/Exception
-rm -rf ri/FalseClass
-rm -rf ri/File
-rm -rf ri/Float
-rm -rf ri/Hash
-rm -rf ri/HashWithIndifferentAccess
-rm -rf ri/Inflector
-rm -rf ri/Integer
-rm -rf ri/Kernel
-rm -rf ri/Logger
-rm -rf ri/MissingSourceFile
-rm -rf ri/Module
-rm -rf ri/NameError
-rm -rf ri/NilClass
-rm -rf ri/Numeric
-rm -rf ri/Object
-rm -rf ri/OrderedOptions
-rm -rf ri/Pathname
-rm -rf ri/Proc
-rm -rf ri/Range
-rm -rf ri/Regexp
-rm -rf ri/REXML
-rm -rf ri/String
-rm -rf ri/Symbol
-rm -rf ri/Test
-rm -rf ri/Time
-rm -rf ri/TimeZone
-rm -rf ri/TrueClass
-rm -rf ri/XmlSimple
+rm -r ri/{CGI,Class,ClassInheritableAttributes,Date,DateTime} \
+	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
 rm -rf $RPM_BUILD_ROOT
@@ -125,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/03/01 00:05:18  baggins
+- updated to 2.3.5
+
 Revision 1.27  2010/02/27 19:19:08  baggins
 - P:ruby-ActiveSupport
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activesupport/ruby-activesupport-nogems.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activesupport/ruby-activesupport.spec?r1=1.27&r2=1.28&f=u



More information about the pld-cvs-commit mailing list