packages: ruby-activerecord2/ruby-activerecord2.spec, ruby-activerecord2/ru...

[baggins]

Author: baggins                      Date: Wed Jun 22 10:47:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.3.5 as separate package (needed by redmine)

---- Files affected:
packages/ruby-activerecord2:
   ruby-activerecord2.spec (1.45 -> 1.46) , ruby-activerecord-rubygems.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/ruby-activerecord2/ruby-activerecord2.spec
diff -u packages/ruby-activerecord2/ruby-activerecord2.spec:1.45 packages/ruby-activerecord2/ruby-activerecord2.spec:1.46
--- packages/ruby-activerecord2/ruby-activerecord2.spec:1.45	Tue Nov 30 23:38:03 2010
+++ packages/ruby-activerecord2/ruby-activerecord2.spec	Wed Jun 22 12:47:11 2011
@@ -3,19 +3,19 @@
 Summary:	Object-Relational mapping library for Ruby
 Summary(pl.UTF-8):	Biblioteka odwzorowań obiektowo-relacyjnych dla Ruby
 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:	4dfaec6d511ad50ede13092f1abadff0
+# Source0-md5:	48a9ab7fbac97478fac9722fb5e14cda
+Patch0:		%{name}-rubygems.patch
 URL:		http://rubyforge.org/projects/activerecord/
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby >= 1:1.8.6
 BuildRequires:	ruby-modules
 %{?ruby_mod_ver_requires_eq}
-Requires:	ruby-activesupport >= 3.0.3
-Requires:	ruby-activemodel >= 3.0.3
+Requires:	ruby-activesupport >= 2.3.5
 Obsoletes:	ruby-ActiveRecord
 Provides:	ruby-ActiveRecord
 #BuildArch:	noarch
@@ -58,6 +58,8 @@
 %prep
 %setup -q -c
 %{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README  -o -print | xargs touch --reference %{SOURCE0}
+%patch0 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -81,9 +83,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG examples
+%doc CHANGELOG README examples
 %{ruby_rubylibdir}/active_record
 %{ruby_rubylibdir}/active_record.rb
+%{ruby_rubylibdir}/activerecord.rb
 
 %files rdoc
 %defattr(644,root,root,755)
@@ -99,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2011/06/22 10:47:11  baggins
+- 2.3.5 as separate package (needed by redmine)
+
 Revision 1.45  2010/11/30 22:38:03  aredridel
 - 3.0.3
 - R: ruby-arel

================================================================
Index: packages/ruby-activerecord2/ruby-activerecord-rubygems.patch
diff -u /dev/null packages/ruby-activerecord2/ruby-activerecord-rubygems.patch:1.4
--- /dev/null	Wed Jun 22 12:47:17 2011
+++ packages/ruby-activerecord2/ruby-activerecord-rubygems.patch	Wed Jun 22 12:47:11 2011
@@ -0,0 +1,21 @@
+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.
+ #++
+ 
+-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'
+ 
+ module ActiveRecord
+   # TODO: Review explicit loads to see if they will automatically be handled by the initilizer.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activerecord2/ruby-activerecord2.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-activerecord2/ruby-activerecord-rubygems.patch?r1=1.3&r2=1.4&f=u