From e5ad7da39041078c550b87543e7c145a9975ce0b Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Feb 09 2012 16:14:15 +0000 Subject: Merge branch 'master' into f17 --- diff --git a/rubygem-rake-0.9.2.2-assert_silent.patch b/rubygem-rake-0.9.2.2-assert_silent.patch deleted file mode 100644 index 78cbb96..0000000 --- a/rubygem-rake-0.9.2.2-assert_silent.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- rake-0.9.2.2/test/test_rake_file_utils.rb.minitest 2011-12-19 12:25:09.032714303 +0900 -+++ rake-0.9.2.2/test/test_rake_file_utils.rb 2011-12-19 13:41:55.851394829 +0900 -@@ -208,6 +208,16 @@ - assert_equal '', err - end - -+ if ! defined?(assert_silent) -+ def assert_silent -+ out, err = capture_io do -+ yield -+ end -+ assert_equal '', out -+ assert_equal '', err -+ end -+ end -+ - def test_sh_verbose_flag_nil - shellcommand - diff --git a/rubygem-rake.spec b/rubygem-rake.spec index 8777fc5..9ef53a6 100644 --- a/rubygem-rake.spec +++ b/rubygem-rake.spec @@ -4,36 +4,37 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname rake -%global geminstdir %{gemdir}/gems/%{gemname}-%{fullver} +%global gem_name rake -%global rubyabi 1.8 +# Macro overrides which support prelease versions. +%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{fullver}/ +%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{fullver}/ +%global gem_cache %{gem_dir}/cache/%{gem_name}-%{fullver}.gem +%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{fullver}.gemspec -%global fedorarel 1 +%global rubyabi 1.9.1 + +%global fedorarel 2 Summary: Ruby based make-like utility -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT URL: http://rake.rubyforge.org -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{fullver}.gem -# Minitest 1.6.0 does not have assert_silent -Patch0: rubygem-rake-0.9.2.2-assert_silent.patch +Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} -BuildRequires: ruby(rubygems) +BuildRequires: rubygems-devel BuildRequires: ruby(abi) = %{rubyabi} ## %%check #BuildRequires: ruby(flexmock) BuildRequires: rubygem(minitest) BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version}-%{release} +Provides: rubygem(%{gem_name}) = %{version}-%{release} %description Rake is a Make-like program implemented in Ruby. Tasks and dependencies are @@ -52,62 +53,66 @@ This package contains documentation for %{name}. %prep %setup -q -c -T -mkdir -p .%{gemdir} +mkdir -p .%{gem_dir} gem install -V \ --local \ - --install-dir $(pwd)/%{gemdir} \ + --install-dir $(pwd)/%{gem_dir} \ --bindir $(pwd)%{_bindir} \ --force \ --rdoc \ %{SOURCE0} -( -cd ./%{geminstdir} -%patch0 -p1 -) %build %install -mkdir -p %{buildroot}%{gemdir} +mkdir -p %{buildroot}%{gem_dir} cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ # rpmlint issue -find %{buildroot}%{geminstdir}/{lib,test} -type f | \ +find %{buildroot}%{gem_instdir}/{lib,test} -type f | \ xargs sed -i -e '\@^#!/usr.*ruby@d' -find %{buildroot}%{geminstdir}/{doc,lib,test} -type f | xargs chmod 0644 +find %{buildroot}%{gem_instdir}/{doc,lib,test} -type f | xargs chmod 0644 # cleanup -rm %{buildroot}%{geminstdir}/.gemtest -rm -f %{buildroot}%{geminstdir}/RRR +rm %{buildroot}%{gem_instdir}/.gemtest +rm -f %{buildroot}%{gem_instdir}/RRR + +# Install man pages into appropriate place. +mkdir -p %{buildroot}%{_mandir}/man1 +mv %{buildroot}%{gem_instdir}/doc/rake.1.gz %{buildroot}%{_mandir}/man1 %check -pushd .%{geminstdir} -export RUBYLIB=$(pwd)/lib -ruby ./bin/rake test +pushd .%{gem_instdir} +ruby -Ilib ./bin/rake test +popd %files %defattr(-,root,root,-) %{_bindir}/rake -%dir %{geminstdir} -%doc %{geminstdir}/README.rdoc -%doc %{geminstdir}/MIT-LICENSE -%doc %{geminstdir}/TODO -%doc %{geminstdir}/CHANGES -%{geminstdir}/bin -%{geminstdir}/lib -%{gemdir}/cache/%{gemname}-%{fullver}.gem -%{gemdir}/specifications/%{gemname}-%{fullver}.gemspec +%dir %{gem_instdir} +%doc %{gem_instdir}/README.rdoc +%doc %{gem_instdir}/MIT-LICENSE +%doc %{gem_instdir}/TODO +%doc %{gem_instdir}/CHANGES +%{gem_instdir}/bin +%{gem_libdir} +%exclude %{gem_cache} +%{gem_spec} +%doc %{_mandir}/man1/* %files doc %defattr(-,root,root,-) -%{geminstdir}/Rakefile -%{geminstdir}/install.rb -%{geminstdir}/doc -%{geminstdir}/test/ -%{gemdir}/doc/%{gemname}-%{fullver}/ +%{gem_instdir}/Rakefile +%{gem_instdir}/install.rb +%{gem_instdir}/doc +%{gem_instdir}/test/ +%{gem_docdir} %changelog +* Thu Feb 09 2012 Vít Ondruch - 0.9.2.2-2 +- Rebuilt for Ruby 1.9.3. + * Sat Jan 14 2012 Fedora Release Engineering - 0.9.2.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild