From b8007954bad5df50e3505cca6794203c8cd5a526 Mon Sep 17 00:00:00 2001 From: Mohammed Morsi Date: Tue, 24 Aug 2010 16:51:57 -0400 Subject: updated to activerecord 2.3.8, added some upstream patches/fixes --- rubygem-activerecord.spec | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'rubygem-activerecord.spec') diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec index dcc65c0..42a5ce9 100644 --- a/rubygem-activerecord.spec +++ b/rubygem-activerecord.spec @@ -9,12 +9,19 @@ Summary: Implements the ActiveRecord pattern for ORM Name: rubygem-%{gemname} Epoch: 1 -Version: 2.3.5 -Release: 1%{?dist} +Version: 2.3.8 +Release: 3%{?dist} Group: Development/Languages License: MIT URL: http://www.rubyonrails.org Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem + +# patch0 needed to make ar tests compatable w/ current sqlite3 version in fedora +Patch0: activerecord-2.3.8-sqlite3-compat.patch + +# patch1 https://rails.lighthouseapp.com/projects/8994/tickets/3210-rails-postgres-issue +Patch1: activerecord-2.3.8-postgres-fix.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = %{rubyabi} Requires: rubygems @@ -43,6 +50,11 @@ mkdir -p ./%{gemdir} gem install --local --install-dir ./%{gemdir} \ --force --rdoc %{SOURCE0} +pushd ./%{geminstdir} +%patch0 -p1 +%patch1 -p1 +popd + # Remove backup files find ./%{geminstdir} -type f -name "*~" -delete @@ -60,6 +72,10 @@ for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file done +# this file is being marked as a doc, need to remove ruby executable path +# and mark as non-executable +sed -i -e 's/^#!\/usr\/bin\/env ruby//' ./%{geminstdir}/examples/performance.rb +chmod 0644 ./%{geminstdir}/examples/performance.rb %build @@ -93,6 +109,15 @@ rake test_sqlite3 --trace %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog +* Mon Aug 16 2010 Mohammed Morsi - 1:2.3.8-3 +- Included postgres fix (patch also pushed upstream, see rails issue tracker) + +* Thu Aug 12 2010 Mohammed Morsi - 1:2.3.8-2 +- Updated patch0 to correctly parse sqlite3 version + +* Wed Aug 04 2010 Mohammed Morsi - 1:2.3.8-1 +- Update to 2.3.8 + * Thu Jan 28 2010 Mamoru Tasaka - 1:2.3.5-1 - Update to 2.3.5 -- cgit