[rubygem-actionpack] Updated to the ActionPack 3.2.6.
Bohuslav Kabrda
bkabrda at fedoraproject.org
Mon Jul 23 08:15:20 UTC 2012
commit 4d535e72f25293481df9c5975cacbb123c9c0bc8
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Mon Jul 23 10:14:54 2012 +0200
Updated to the ActionPack 3.2.6.
- Remove Rake dependency.
- Introduce -doc subpackage.
- Relax sprockets dependency.
.gitignore | 2 +
Rakefile | 71 -----------
actionpack-downgrade-dependencies.patch | 29 -----
actionpack-rakefile-fix.patch | 15 ---
...gem-actionpack-relax-sprockets-dependency.patch | 29 +++++
rubygem-actionpack.spec | 128 ++++++++++----------
sources | 4 +-
7 files changed, 98 insertions(+), 180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b80d77..d2031b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ actionpack-2.3.8.gem
/actionpack-3.0.13.gem
/actionpack-3.0.15-tests.tgz
/actionpack-3.0.15.gem
+/actionpack-3.2.6-tests.tgz
+/actionpack-3.2.6.gem
diff --git a/rubygem-actionpack-relax-sprockets-dependency.patch b/rubygem-actionpack-relax-sprockets-dependency.patch
new file mode 100644
index 0000000..25f6aef
--- /dev/null
+++ b/rubygem-actionpack-relax-sprockets-dependency.patch
@@ -0,0 +1,29 @@
+--- specifications/actionpack-3.2.6.gemspec.old 2012-07-20 12:06:27.000000000 +0200
++++ specifications/actionpack-3.2.6.gemspec 2012-07-20 12:44:09.491547387 +0200
+@@ -27,7 +27,7 @@
+ s.add_runtime_dependency(%q<rack>, ["~> 1.4.0"])
+ s.add_runtime_dependency(%q<rack-test>, ["~> 0.6.1"])
+ s.add_runtime_dependency(%q<journey>, ["~> 1.0.1"])
+- s.add_runtime_dependency(%q<sprockets>, ["~> 2.1.3"])
++ s.add_runtime_dependency(%q<sprockets>, [">= 2.1.3"])
+ s.add_runtime_dependency(%q<erubis>, ["~> 2.7.0"])
+ s.add_development_dependency(%q<tzinfo>, ["~> 0.3.29"])
+ else
+@@ -38,7 +38,7 @@
+ s.add_dependency(%q<rack>, ["~> 1.4.0"])
+ s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
+ s.add_dependency(%q<journey>, ["~> 1.0.1"])
+- s.add_dependency(%q<sprockets>, ["~> 2.1.3"])
++ s.add_dependency(%q<sprockets>, [">= 2.1.3"])
+ s.add_dependency(%q<erubis>, ["~> 2.7.0"])
+ s.add_dependency(%q<tzinfo>, ["~> 0.3.29"])
+ end
+@@ -50,7 +50,7 @@
+ s.add_dependency(%q<rack>, ["~> 1.4.0"])
+ s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
+ s.add_dependency(%q<journey>, ["~> 1.0.1"])
+- s.add_dependency(%q<sprockets>, ["~> 2.1.3"])
++ s.add_dependency(%q<sprockets>, [">= 2.1.3"])
+ s.add_dependency(%q<erubis>, ["~> 2.7.0"])
+ s.add_dependency(%q<tzinfo>, ["~> 0.3.29"])
+ end
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index d7a36cc..858d2bb 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -6,60 +6,64 @@
Summary: Web-flow and rendering framework putting the VC in MVC
Name: rubygem-%{gem_name}
Epoch: 1
-Version: 3.0.15
-Release: 2%{?dist}
+Version: 3.2.6
+Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: http://www.rubyonrails.org
Source0: http://rubygems.org/downloads/actionpack-%{version}.gem
-# The actionpack gem doesn't ship with the upstream Rakefile
-Source1: http://github.com/rails/rails/raw/v%{version}/%{gem_name}/Rakefile
-
# Also the actionpack 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/actionpack/
-# git checkout v3.0.15
-# tar czvf actionpack-3.0.15-tests.tgz test/
+# git checkout v3.2.6
+# tar czvf actionpack-3.2.6-tests.tgz test/
Source2: actionpack-%{version}-tests.tgz
Patch0: rubygem-actionpack-enable-test.patch
+Patch1: rubygem-actionpack-relax-sprockets-dependency.patch
-# Remove a task which breaks the Rakefile due to the gemspec
-# not being present in the gem
-Patch1: actionpack-rakefile-fix.patch
-
-Patch3: actionpack-downgrade-dependencies.patch
-
+# Let's keep Requires and BuildRequires sorted alphabeticaly
Requires: ruby(rubygems)
-Requires: rubygem(activesupport) = %{version}
Requires: rubygem(activemodel) = %{version}
-Requires: rubygem(builder) = 2.1.2
-Requires: rubygem(i18n) >= 0.5.0
-Requires: rubygem(rack) >= 1.0.0
-Requires: rubygem(rack-test)
-Requires: rubygem(rack-mount)
-Requires: rubygem(tzinfo) >= 0.3.23
-Requires: rubygem(erubis) >= 2.6.5
-Requires: rubygem(erubis) < 2.7.0
+Requires: rubygem(activesupport) = %{version}
+Requires: rubygem(builder) >= 3.0.0
+Requires: rubygem(builder) < 3.1
+Requires: rubygem(erubis) >= 2.7.0
+Requires: rubygem(erubis) < 2.8
+Requires: rubygem(journey) >= 1.0.4
+Requires: rubygem(journey) < 1.1
+Requires: rubygem(rack) >= 1.4.0
+Requires: rubygem(rack) < 1.5
+Requires: rubygem(rack-cache) >= 1.2
+Requires: rubygem(rack-cache) < 2
+Requires: rubygem(rack-test) >= 0.6.1
+Requires: rubygem(rack-test) < 0.7
+Requires: rubygem(sprockets) >= 2.1.3
Requires: ruby(abi) = %{rubyabi}
BuildRequires: rubygems-devel
-BuildRequires: rubygem(rake)
-BuildRequires: rubygem(mocha) >= 0.9.7
+BuildRequires: rubygem(activemodel) = %{version}
+BuildRequires: rubygem(activerecord) = %{version}
BuildRequires: rubygem(activesupport) = %{version}
-BuildRequires: rubygem(activemodel) = %{version}
-BuildRequires: rubygem(activerecord) = %{version}
-BuildRequires: rubygem(sqlite3)
-BuildRequires: rubygem(builder) = 2.1.2
-BuildRequires: rubygem(i18n) >= 0.5.0
-BuildRequires: rubygem(rack) >= 1.0.0
-BuildRequires: rubygem(rack-test)
-BuildRequires: rubygem(rack-mount)
-BuildRequires: rubygem(tzinfo) >= 0.3.23
-BuildRequires: rubygem(erubis) >= 2.6.5
-BuildRequires: rubygem(erubis) < 2.7.0
+BuildRequires: rubygem(erubis) >= 2.7.0
+BuildRequires: rubygem(erubis) < 2.8
+BuildRequires: rubygem(journey) >= 1.0.4
+BuildRequires: rubygem(journey) < 1.1
BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(mocha) >= 0.9.8
+BuildRequires: rubygem(rack) >= 1.4.0
+BuildRequires: rubygem(rack) < 1.5
+BuildRequires: rubygem(rack-cache) >= 1.2
+BuildRequires: rubygem(rack-cache) < 2
+BuildRequires: rubygem(rack-test) >= 0.6.1
+BuildRequires: rubygem(rack-test) < 0.7
+BuildRequires: rubygem(sprockets) >= 2.1.3
+BuildRequires: rubygem(sqlite3)
+BuildRequires: rubygem(therubyracer)
+BuildRequires: rubygem(tzinfo) >= 0.3.29
+BuildRequires: rubygem(tzinfo) < 0.4
+BuildRequires: rubygem(uglifier)
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %{version}
@@ -68,27 +72,26 @@ Eases web-request routing, handling, and response as a half-way front,
half-way page controller. Implemented with specific emphasis on enabling easy
unit/integration testing that doesn't require a browser.
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires:%{name} = %{version}-%{release}
+
+%description doc
+Documentation for %{name}
%prep
%setup -q -c -T
mkdir -p .%{gem_dir}
gem install --local --install-dir .%{gem_dir} \
-V \
- --force --rdoc %{SOURCE0}
-
-# forcely modify gemspec for rack dependency
-sed -i -e '/rack/s|~>|>=|' \
- ./%{gem_dir}/specifications/*gemspec
-
-# move the Rakefile in place
-cp %{SOURCE1} .%{gem_instdir}
+ --force --no-rdoc %{SOURCE0}
# move the tests into place
tar xzvf %{SOURCE2} -C .%{gem_instdir}
pushd .%{gem_instdir}
%patch0 -p0
-%patch1 -p0
# create missing symlink
pushd test/fixtures/layout_tests/layouts/
@@ -98,7 +101,7 @@ popd
popd
pushd .%{gem_dir}
-%patch3 -p0
+%patch1 -p0
popd
# Remove backup files
@@ -130,43 +133,42 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
rm -rf %{buildroot}
%check
-# Don't pollute /tmp, it won't be cleaned up after build
-rm -rf ./tmpdir
-mkdir ./tmpdir
-export TMPDIR=$(pwd)/tmpdir
-
pushd .%{gem_instdir}
# load_path is not available, remove its require.
sed -i '1,2d' test/abstract_unit.rb
-# While work locally, this test fails on Koji. Can't find a reason why. It
-# might be related to different rubygem-mock version used by Fedora then Rails
-# specifies.
-sed -i '375,383 s|^|#|' test/dispatch/request_test.rb
-
# dependency loop
# depends on actionmailer, while actionmailer has BR(check): actionpack
mv test/controller/assert_select_test.rb \
test/controller/assert_select_test.rb.skip
-# Now as far as I checked rake test succeeds.
-rake test --trace
+ruby -w -I.:lib:test -e 'Dir.glob("test/{abstract,controller,dispatch,template}/**/*_test.rb").each {|t| require t}'
+# activerecord tests must be run separately, otherwise we get superclass mismatch error
+# due to test classes that have same names in activerecord and other tests
+ruby -w -I.:lib:test -e 'Dir.glob("test/activerecord/**/*_test.rb").each {|t| require t}'
+popd
%files
%dir %{gem_instdir}
-%doc %{gem_instdir}/CHANGELOG
-%{gem_libdir}
%doc %{gem_instdir}/MIT-LICENSE
-%{gem_instdir}/Rakefile
-%doc %{gem_instdir}/README.rdoc
-%doc %{gem_instdir}/test/
-%doc %{gem_docdir}
+%{gem_libdir}
%exclude %{gem_cache}
%{gem_spec}
+%files doc
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/README.rdoc
+%{gem_instdir}/test/
%changelog
+* Thu Jul 19 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1:3.2.6-1
+- Updated to the ActionPack 3.2.6.
+- Remove Rake dependency.
+- Introduce -doc subpackage.
+- Relax sprockets dependency.
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 268cbf9..9030d92 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6796180681a01e8f15cedca86e2d8b59 actionpack-3.0.15-tests.tgz
-edd7d991db8729d769a0e16f7412aa37 actionpack-3.0.15.gem
+ad5c233c46c2074bc061a86d8ccfdbb9 actionpack-3.2.6-tests.tgz
+bdc7fc55c7a28752e4938851be3f63cd actionpack-3.2.6.gem
More information about the scm-commits
mailing list