diff options
author | Bohuslav Kabrda <bkabrda@redhat.com> | 2012-07-18 15:09:08 +0200 |
---|---|---|
committer | Bohuslav Kabrda <bkabrda@redhat.com> | 2012-07-18 15:09:08 +0200 |
commit | fc56e2eeca1ea3710b03d9aa1c4e83d3e71593f5 (patch) | |
tree | dd11362c151b8a4144b8fa3f148d25be93abd944 /rubygem-activesupport.spec | |
parent | 7e51ad431bcd04ef6756ff062ba683e3b1201c59 (diff) | |
download | rubygem-activesupport-fc56e2eeca1ea3710b03d9aa1c4e83d3e71593f5.tar.gz rubygem-activesupport-fc56e2eeca1ea3710b03d9aa1c4e83d3e71593f5.tar.xz rubygem-activesupport-fc56e2eeca1ea3710b03d9aa1c4e83d3e71593f5.zip |
Update to ActiveSupport 3.2.6.
- Removed unneeded BuildRoot tag.
- Tests no longer fail with newer versions of Mocha, remove workaround.
Diffstat (limited to 'rubygem-activesupport.spec')
-rw-r--r-- | rubygem-activesupport.spec | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index ea16356..e564a65 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -6,7 +6,7 @@ Summary: Support and utility classes used by the Rails framework Name: rubygem-%{gem_name} Epoch: 1 -Version: 3.0.15 +Version: 3.2.6 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -18,8 +18,8 @@ Source0: http://rubygems.org/downloads/activesupport-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v3.0.15 -# tar czvf activesupport-3.0.15-tests.tgz test/ +# git checkout v3.2.6 +# tar czvf activesupport-3.2.6-tests.tgz test/ Source2: activesupport-%{version}-tests.tgz # Removes code which breaks the test suite due to a @@ -35,20 +35,26 @@ Patch2: activesupport-remove-memcache-build-dep.patch # it under %%{gem_dir} (therefore if not in Gemfile, it won't be found). Patch4: activesupport-add-bigdecimal-dependency.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} -Requires: rubygem(i18n) +# Let's keep Requires and BuildRequires sorted alphabeticaly Requires: rubygem(bigdecimal) +Requires: rubygem(i18n) >= 0.6 +Requires: rubygem(i18n) < 1.0 +Requires: rubygem(multi_json) >= 1.0 +Requires: rubygem(multi_json) < 2 BuildRequires: rubygems-devel -BuildRequires: rubygem(mocha) -BuildRequires: rubygem(i18n) -#BuildRequires: rubygem(memcache-client) -BuildRequires: rubygem(tzinfo) +BuildRequires: rubygem(bigdecimal) BuildRequires: rubygem(builder) -BuildRequires: rubygem(rack) +BuildRequires: rubygem(i18n) >= 0.6 +BuildRequires: rubygem(i18n) < 1.0 +#BuildRequires: rubygem(memcache-client) BuildRequires: rubygem(minitest) -BuildRequires: rubygem(bigdecimal) +BuildRequires: rubygem(mocha) +BuildRequires: rubygem(multi_json) >= 1.0 +BuildRequires: rubygem(multi_json) < 2 +BuildRequires: rubygem(rack) +BuildRequires: rubygem(tzinfo) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version} @@ -84,17 +90,14 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir} %check pushd %{buildroot}%{gem_instdir} -# Test fails with newer mocha. Keep with older one is not solution. -# https://github.com/rails/rails/pull/6046 -sed -i '35,41 s|^|#|' test/whiny_nil_test.rb - ruby -Itest -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}" popd %files %dir %{gem_instdir} -%doc %{gem_instdir}/CHANGELOG +%doc %{gem_instdir}/CHANGELOG.md %{gem_libdir} +%doc %{gem_instdir}/MIT-LICENSE %doc %{gem_instdir}/README.rdoc %doc %{gem_docdir} %{gem_cache} @@ -103,6 +106,11 @@ popd %changelog +* Wed Jul 18 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.2.6-1 +- Update to ActiveSupport 3.2.6. +- Removed unneeded BuildRoot tag. +- Tests no longer fail with newer versions of Mocha, remove workaround. + * Fri Jun 15 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.0.15-1 - Update to ActiveSupport 3.0.15. |