diff options
author | Bohuslav Kabrda <bkabrda@redhat.com> | 2012-01-31 12:10:50 +0100 |
---|---|---|
committer | Bohuslav Kabrda <bkabrda@redhat.com> | 2012-01-31 12:10:50 +0100 |
commit | a89e8a25fc7b0de99ca829d53878e237636a09db (patch) | |
tree | b584123c72256d7898771f0920c2d57b3d0594de | |
parent | d9a10ad67195ad29677bfa2ed901aaa4147cd110 (diff) | |
download | rubygem-activerecord-a89e8a25fc7b0de99ca829d53878e237636a09db.tar.gz rubygem-activerecord-a89e8a25fc7b0de99ca829d53878e237636a09db.tar.xz rubygem-activerecord-a89e8a25fc7b0de99ca829d53878e237636a09db.zip |
Rebuilt for Ruby 1.9.3.
- Update to ActionPack 3.0.11
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | activerecord-downgrade-dependencies.patch | 16 | ||||
-rw-r--r-- | rubygem-activerecord.spec | 87 | ||||
-rw-r--r-- | sources | 4 |
4 files changed, 57 insertions, 52 deletions
@@ -8,3 +8,5 @@ activerecord-2.3.8.gem /activerecord-3.0.9.gem /activerecord-3.0.10-tests.tgz /activerecord-3.0.10.gem +/activerecord-3.0.11-tests.tgz +/activerecord-3.0.11.gem diff --git a/activerecord-downgrade-dependencies.patch b/activerecord-downgrade-dependencies.patch index bf28aca..b22619b 100644 --- a/activerecord-downgrade-dependencies.patch +++ b/activerecord-downgrade-dependencies.patch @@ -1,22 +1,22 @@ ---- specifications/activerecord-3.0.10.gemspec.orig -+++ specifications/activerecord-3.0.10.gemspec +--- specifications/activerecord-3.0.11.gemspec.orig ++++ specifications/activerecord-3.0.11.gemspec @@ -25,18 +25,18 @@ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<activesupport>, ["= 3.0.10"]) - s.add_runtime_dependency(%q<activemodel>, ["= 3.0.10"]) + s.add_runtime_dependency(%q<activesupport>, ["= 3.0.11"]) + s.add_runtime_dependency(%q<activemodel>, ["= 3.0.11"]) - s.add_runtime_dependency(%q<arel>, ["~> 2.0.10"]) + s.add_runtime_dependency(%q<arel>, ["~> 2.0.9"]) s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"]) else - s.add_dependency(%q<activesupport>, ["= 3.0.10"]) - s.add_dependency(%q<activemodel>, ["= 3.0.10"]) + s.add_dependency(%q<activesupport>, ["= 3.0.11"]) + s.add_dependency(%q<activemodel>, ["= 3.0.11"]) - s.add_dependency(%q<arel>, ["~> 2.0.10"]) + s.add_dependency(%q<arel>, ["~> 2.0.9"]) s.add_dependency(%q<tzinfo>, ["~> 0.3.23"]) end else - s.add_dependency(%q<activesupport>, ["= 3.0.10"]) - s.add_dependency(%q<activemodel>, ["= 3.0.10"]) + s.add_dependency(%q<activesupport>, ["= 3.0.11"]) + s.add_dependency(%q<activemodel>, ["= 3.0.11"]) - s.add_dependency(%q<arel>, ["~> 2.0.10"]) + s.add_dependency(%q<arel>, ["~> 2.0.9"]) s.add_dependency(%q<tzinfo>, ["~> 0.3.23"]) diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec index 7accd68..96fbc08 100644 --- a/rubygem-activerecord.spec +++ b/rubygem-activerecord.spec @@ -1,30 +1,27 @@ # Generated from activerecord-1.15.5.gem by gem2rpm -*- rpm-spec -*- -%global gemname activerecord +%global gem_name activerecord -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} - -%global rubyabi 1.8 +%global rubyabi 1.9.1 Summary: Implements the ActiveRecord pattern for ORM -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Epoch: 1 -Version: 3.0.10 -Release: 2%{?dist} +Version: 3.0.11 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://www.rubyonrails.org Source0: http://rubygems.org/downloads/activerecord-%{version}.gem # The activerecord gem doesn't ship with the upstream Rakefile -Source1: http://github.com/rails/rails/raw/v%{version}/%{gemname}/Rakefile +Source1: http://github.com/rails/rails/raw/v%{version}/%{gem_name}/Rakefile # Also the activerecord gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activerecord/ -# git checkout v3.0.10 -# tar czvf activerecord-3.0.10-tests.tgz test/ +# git checkout v3.0.11 +# tar czvf activerecord-3.0.11-tests.tgz test/ Source2: activerecord-%{version}-tests.tgz # Remove a task which breaks the Rakefile due to the gemspec @@ -38,13 +35,13 @@ Patch1: activerecord-tests-fix.patch Patch2: activerecord-downgrade-dependencies.patch Requires: ruby(abi) = %{rubyabi} -Requires: rubygems +Requires: ruby(rubygems) Requires: rubygem(activesupport) = %{version} Requires: rubygem(activemodel) = %{version} Requires: rubygem(arel) Requires: rubygem(tzinfo) >= 0.3.23 Requires: rubygem(i18n) -BuildRequires: rubygems +BuildRequires: rubygems-devel BuildRequires: rubygem(rake) BuildRequires: rubygem(activesupport) = %{version} BuildRequires: rubygem(activemodel) = %{version} @@ -52,10 +49,11 @@ BuildRequires: rubygem(sqlite3) BuildRequires: rubygem(erubis) BuildRequires: rubygem(mocha) BuildRequires: rubygem(i18n) -BuildRequires: rubygem(arel) +BuildRequires: rubygem(arel) BuildRequires: rubygem(tzinfo) >= 0.3.23 +BuildRequires: rubygem(minitest) BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database @@ -66,61 +64,61 @@ manual SQL. %prep %setup -q -c -T -# rake test creates debug.log under %%{geminstdir}, +# rake test creates debug.log under %%{gem_instdir}, # so let's install gem file under %%{_builddir} first -mkdir -p ./%{gemdir} -gem install --local --install-dir ./%{gemdir} \ +mkdir -p ./%{gem_dir} +gem install --local --install-dir ./%{gem_dir} \ --force --rdoc %{SOURCE0} # move the Rakefile in place -cp %{SOURCE1} .%{geminstdir} +cp %{SOURCE1} .%{gem_instdir} # move the tests into place -tar xzvf %{SOURCE2} -C .%{geminstdir} +tar xzvf %{SOURCE2} -C .%{gem_instdir} -pushd ./%{geminstdir} +pushd ./%{gem_instdir} %patch0 -p0 %patch1 -p0 popd -pushd .%{gemdir} +pushd .%{gem_dir} %patch2 -p0 popd # Remove backup files -find ./%{geminstdir} -type f -name "*~" -delete +find ./%{gem_instdir} -type f -name "*~" -delete # Delete zero-length files # No! These are needed for rake test -# find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \; +# find ./%{gem_instdir} -type f -size 0c -exec rm -rvf {} \; # Fix anything executable that does not have a shebang -for file in `find ./%{geminstdir} -type f -perm /a+x`; do +for file in `find ./%{gem_instdir} -type f -perm /a+x`; do [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file done # Find files with a shebang that do not have executable permissions -for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do +for file in `find ./%{gem_instdir} -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 +sed -i -e 's/^#!\/usr\/bin\/env ruby//' ./%{gem_instdir}/examples/performance.rb +chmod 0644 ./%{gem_instdir}/examples/performance.rb %build %install -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* %{buildroot}%{gemdir} +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* %{buildroot}%{gem_dir} %clean rm -rf %{buildroot} %check -pushd .%{geminstdir} +pushd .%{gem_instdir} # to prevent a circular dependency w/ actionpack mv test/cases/session_store/session_test.rb \ @@ -128,22 +126,27 @@ mv test/cases/session_store/session_test.rb \ # Only test sqlite3 backend rake test_sqlite3 --trace +popd %files %defattr(-, root, root, -) -%dir %{geminstdir} -%doc %{geminstdir}/CHANGELOG -%doc %{geminstdir}/examples -%{geminstdir}/lib -%{geminstdir}/Rakefile -%doc %{geminstdir}/README.rdoc -%{geminstdir}/test - -%doc %{gemdir}/doc/%{gemname}-%{version} -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%dir %{gem_instdir} +%doc %{gem_instdir}/CHANGELOG +%doc %{gem_instdir}/examples +%{gem_libdir} +%{gem_instdir}/Rakefile +%doc %{gem_instdir}/README.rdoc +%{gem_instdir}/test + +%doc %{gem_docdir} +%{gem_cache} +%{gem_spec} %changelog +* Tue Jan 31 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.11-1 +- Rebuilt for Ruby 1.9.3. +- Update to ActionPack 3.0.11 + * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -1,2 +1,2 @@ -b036d6e4ce9ed15b1e5058bf998e0f89 activerecord-3.0.10-tests.tgz -f40d3e39bd16d9a8765d0167158a3313 activerecord-3.0.10.gem +2bdf929c7209c010bbc6b382d41251fc activerecord-3.0.11-tests.tgz +8ecb8d9c39b6ac88bdb8068dcd6311f7 activerecord-3.0.11.gem |