summaryrefslogtreecommitdiffstats
path: root/rubygem-actionpack.spec
diff options
context:
space:
mode:
Diffstat (limited to 'rubygem-actionpack.spec')
-rw-r--r--rubygem-actionpack.spec31
1 files changed, 21 insertions, 10 deletions
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index 851cc49..e8ba364 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -9,25 +9,25 @@
Summary: Web-flow and rendering framework putting the VC in MVC
Name: rubygem-%{gemname}
Epoch: 1
-Version: 2.3.5
+Version: 2.3.8
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://www.rubyonrails.org
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: rubygem-actionpack-2.3.4-enable-test.patch
+Patch0: rubygem-actionpack-2.3.8-enable-test.patch
#
# Please someone fix the following Patch2!! (mtasaka)
#
-Patch2: rubygem-actionpack-2.3.5-rack-compat.patch
+#Patch2: rubygem-actionpack-2.3.8-rack-compat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygems
Requires: rubygem(activesupport) = %{version}
-Requires: rubygem(rack) >= 1.0.0
+Requires: rubygem(rack) >= 1.1.0
Requires: ruby(abi) = %{rubyabi}
BuildRequires: rubygems
BuildRequires(check): rubygem(rake)
-BuildRequires(check): rubygem(rack) >= 1.0.0
+BuildRequires(check): rubygem(rack) >= 1.1.0
BuildRequires(check): rubygem(mocha) >= 0.9.7
BuildRequires(check): rubygem(activerecord) = %{version}
BuildRequires(check): rubygem(sqlite3-ruby)
@@ -49,11 +49,10 @@ gem install --local --install-dir .%{gemdir} \
# forcely modify gemspec for rack dependency
sed -i -e '/rack/s|~>|>=|' \
- ./%{gemdir}/specifications/*gemspec
+ ./%{gemdir}/specifications/*gemspec
pushd .%{geminstdir}
-%patch0 -p0
-%patch2 -p0
+%patch0 -p1
# create missing symlink
pushd test/fixtures/layout_tests/layouts/
@@ -70,6 +69,12 @@ popd
# No! these are also needed for rake test
# find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+# Fix wrong-file-end-of-line-encoding errors
+# No! these are also needed for rake test
+#for file in test/fixtures/multipart/* ; do
+# sed -i 's/\r//' $file
+#done
+
# Fix anything executable that does not have a shebang
for file in `find ./%{geminstdir} -type f -perm /a+x`; do
[ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
@@ -111,11 +116,11 @@ rake test --trace
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{geminstdir}/CHANGELOG
-%doc %{geminstdir}/install.rb
%{geminstdir}/lib
%doc %{geminstdir}/MIT-LICENSE
-%{geminstdir}/Rakefile
%doc %{geminstdir}/README
+%doc %{geminstdir}/install.rb
+%{geminstdir}/Rakefile
%doc %{geminstdir}/RUNNING_UNIT_TESTS
%doc %{geminstdir}/test/
%doc %{gemdir}/doc/%{gemname}-%{version}
@@ -124,6 +129,12 @@ rake test --trace
%changelog
+* Thu Aug 12 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-2
+- Bumped actionpack rack dependency to version 1.1.0
+
+* Mon Aug 09 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-1
+- Update to 2.3.8
+
* Mon May 17 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:2.3.5-2
- Set TMPDIR environment at %%check to make it sure all files created
during rpmbuild are cleaned up