diff --git a/.gitignore b/.gitignore index a4b1739..f2b03c6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ activesupport-2.3.8.gem /activesupport-3.0.9.gem /activesupport-3.0.10-tests.tgz /activesupport-3.0.10.gem +/activesupport-3.0.11-tests.tgz +/activesupport-3.0.11.gem diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index c02cc25..d436d5a 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -1,14 +1,12 @@ -%global gemname activesupport +%global gem_name activesupport -%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: Support and utility classes used by the Rails framework -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Epoch: 1 -Version: 3.0.10 +Version: 3.0.11 Release: 2%{?dist} Group: Development/Languages License: MIT @@ -20,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.10 -# tar czvf activesupport-3.0.10-tests.tgz test/ +# git checkout v3.0.11 +# tar czvf activesupport-3.0.11-tests.tgz test/ Source2: activesupport-%{version}-tests.tgz # Removes code which breaks the test suite due to a @@ -33,18 +31,21 @@ Patch1: activesupport-tests-fix.patch Patch2: activesupport-remove-memcache-build-dep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rubygems +Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: rubygem(i18n) -BuildRequires: rubygems +Requires: rubygem(bigdecimal) +BuildRequires: rubygems-devel BuildRequires: rubygem(mocha) BuildRequires: rubygem(i18n) #BuildRequires: rubygem(memcache-client) BuildRequires: rubygem(tzinfo) BuildRequires: rubygem(builder) BuildRequires: rubygem(rack) +BuildRequires: rubygem(minitest) +BuildRequires: rubygem(bigdecimal) BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description Utility library which carries commonly used classes and @@ -52,45 +53,47 @@ goodies from the Rails framework %prep %setup -q -c -T -mkdir -p .%{gemdir} -gem install --local --install-dir .%{gemdir} \ +mkdir -p .%{gem_dir} +gem install --local --install-dir .%{gem_dir} \ --force -V --rdoc %{SOURCE0} # move the tests into place -tar xzvf %{SOURCE2} -C .%{geminstdir} +tar xzvf %{SOURCE2} -C .%{gem_instdir} -pushd .%{geminstdir} +pushd .%{gem_instdir} %patch1 -p0 %patch2 -p0 +popd %build %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* %{buildroot}%{gemdir} +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* %{buildroot}%{gem_dir} %check -pushd %{buildroot}%{geminstdir} -ruby -Itest -e "Dir.glob('test/**/*_test.rb').each {|t| require t}" +pushd %{buildroot}%{gem_instdir} +ruby -Itest -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}" popd %files %defattr(-, root, root, -) -%dir %{geminstdir} -%doc %{geminstdir}/CHANGELOG -%{geminstdir}/lib -%doc %{geminstdir}/README.rdoc -%doc %{gemdir}/doc/%{gemname}-%{version} -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec -%{geminstdir}/test +%dir %{gem_instdir} +%doc %{gem_instdir}/CHANGELOG +%{gem_libdir} +%doc %{gem_instdir}/README.rdoc +%doc %{gem_docdir} +%{gem_cache} +%{gem_spec} +%{gem_instdir}/test %changelog -* Sat Jan 14 2012 Fedora Release Engineering - 1:3.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Tue Jan 24 2012 Bohuslav Kabrda - 1:3.0.11-1 +- Rebuilt for Ruby 1.9.3. +- Update to ActiveSupport 3.0.11. * Mon Aug 22 2011 Vít Ondruch - 1:3.0.10-1 - Update to ActiveSupport 3.0.10 diff --git a/sources b/sources index dc9ad9e..6dc8296 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ab6e573a8424eda7ef4989d72881ad26 activesupport-3.0.10-tests.tgz -a79c965ef7c6f40cc95011af8778ff0a activesupport-3.0.10.gem +4c658e371610208a6956afd007b48e35 activesupport-3.0.11-tests.tgz +8daae4e695fb7e3e3e7edc02662bd04b activesupport-3.0.11.gem