packages: ruby-activerecord/ruby-activerecord-rubygems.patch, ruby-activere...

baggins baggins at pld-linux.org
Sun Feb 28 18:34:00 CET 2010


Author: baggins                      Date: Sun Feb 28 17:34:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.3.5

---- Files affected:
packages/ruby-activerecord:
   ruby-activerecord-rubygems.patch (1.1 -> 1.2) , ruby-activerecord.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/ruby-activerecord/ruby-activerecord-rubygems.patch
diff -u packages/ruby-activerecord/ruby-activerecord-rubygems.patch:1.1 packages/ruby-activerecord/ruby-activerecord-rubygems.patch:1.2
--- packages/ruby-activerecord/ruby-activerecord-rubygems.patch:1.1	Sat Aug 30 01:03:49 2008
+++ packages/ruby-activerecord/ruby-activerecord-rubygems.patch	Sun Feb 28 18:33:55 2010
@@ -1,25 +1,21 @@
-diff -Nur activerecord-2.1.0.orig/lib/active_record.rb activerecord-2.1.0.rubygems/lib/active_record.rb
---- activerecord-2.1.0.orig/lib/active_record.rb	2008-05-31 19:52:51.000000000 -0600
-+++ activerecord-2.1.0.rubygems/lib/active_record.rb	2008-08-29 17:02:32.000000000 -0600
-@@ -21,20 +21,7 @@
+diff --git a/lib/active_record.rb b/lib/active_record.rb
+index 2f8c5c7..424faeb 100644
+--- a/lib/active_record.rb
++++ b/lib/active_record.rb
+@@ -21,15 +21,7 @@
  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  #++
  
--$:.unshift(File.dirname(__FILE__)) unless
--  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
--
--unless defined? ActiveSupport
--  active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib"
--  if File.exist?(active_support_path)
--    $:.unshift active_support_path
--    require 'active_support'
--  else
--    require 'rubygems'
--    gem 'activesupport'
+-begin
+-  require 'active_support'
+-rescue LoadError
+-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+-  if File.directory?(activesupport_path)
+-    $:.unshift activesupport_path
 -    require 'active_support'
 -  end
 -end
 +require 'active_support'
  
- require 'active_record/base'
- require 'active_record/named_scope'
+ module ActiveRecord
+   # TODO: Review explicit loads to see if they will automatically be handled by the initilizer.

================================================================
Index: packages/ruby-activerecord/ruby-activerecord.spec
diff -u packages/ruby-activerecord/ruby-activerecord.spec:1.41 packages/ruby-activerecord/ruby-activerecord.spec:1.42
--- packages/ruby-activerecord/ruby-activerecord.spec:1.41	Sat Feb 27 20:19:50 2010
+++ packages/ruby-activerecord/ruby-activerecord.spec	Sun Feb 28 18:33:55 2010
@@ -6,14 +6,13 @@
 Summary:	Object-Relational mapping library for Ruby
 Summary(pl.UTF-8):	Biblioteka odwzorowań obiektowo-relacyjnych dla Ruby
 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/45356/%{pkgname}-%{version}.tgz
-# Source0-md5:	66f03d75467fdf589daa59a93ff84001
-Patch0:		%{name}-sqlitethreads.patch
-Patch1:		%{name}-rubygems.patch
+Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5:	48a9ab7fbac97478fac9722fb5e14cda
+Patch0:		%{name}-rubygems.patch
 URL:		http://rubyforge.org/projects/activerecord/
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby >= 1:1.8.6
@@ -49,10 +48,10 @@
 Dokumentacja do biblioteki ActiveRecord.
 
 %prep
-%setup -q -n activerecord-%{version}
+%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_record/vendor
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -97,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2010/02/28 17:33:55  baggins
+- updated to 2.3.5
+
 Revision 1.41  2010/02/27 19:19:50  baggins
 - P:ruby-ActiveRecord
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activerecord/ruby-activerecord-rubygems.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activerecord/ruby-activerecord.spec?r1=1.41&r2=1.42&f=u



More information about the pld-cvs-commit mailing list