diff --git a/.gitignore b/.gitignore index 60bc23f..0dab83d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rdoc-3.8.gem +/rdoc-3.12.gem diff --git a/rubygem-rdoc-remove-isolate.patch b/rubygem-rdoc-remove-isolate.patch deleted file mode 100644 index c6d0355..0000000 --- a/rubygem-rdoc-remove-isolate.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Rakefile.orig 2011-07-14 14:28:36.000000000 -0400 -+++ Rakefile 2011-07-14 14:29:05.000000000 -0400 -@@ -3,7 +3,6 @@ $:.unshift 'lib' - require 'rdoc/rdoc' - - Hoe.plugin :git --Hoe.plugin :isolate - Hoe.plugin :minitest - Hoe.plugin :rdoc_tags - -@@ -20,12 +19,8 @@ Hoe.spec 'rdoc' do - rdoc_locations << 'drbrain@rubyforge.org:/var/www/gforge-projects/rdoc/' - - self.testlib = :minitest -- self.isolate_dir = 'tmp/isolate' - - require_ruby_version '>= 1.8.7' -- extra_dev_deps << ['minitest', '~> 2'] -- extra_dev_deps << ['isolate', '~> 3'] -- extra_dev_deps << ['ZenTest', '~> 4'] # for autotest/isolate - - extra_rdoc_files << 'Rakefile' - spec_extras['required_rubygems_version'] = '>= 1.3' ---- .autotest.orig 2011-07-14 14:28:59.000000000 -0400 -+++ .autotest 2011-07-14 14:29:03.000000000 -0400 -@@ -1,7 +1,6 @@ - # vim: filetype=ruby - - require 'autotest/restart' --require 'autotest/isolate' - - Autotest.add_hook :initialize do |at| - at.testlib = 'minitest/unit' if at.respond_to? :testlib= diff --git a/rubygem-rdoc.spec b/rubygem-rdoc.spec index f62226b..7f689ec 100644 --- a/rubygem-rdoc.spec +++ b/rubygem-rdoc.spec @@ -1,27 +1,26 @@ # Generated from rdoc-3.4.gem by gem2rpm -*- rpm-spec -*- -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname rdoc -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global gem_name rdoc -%define rubyabi 1.8 +%global rubyabi 1.9.1 Summary: RDoc produces HTML and command-line documentation for Ruby projects -Name: rubygem-%{gemname} -Version: 3.8 -Release: 3%{?dist} +Name: rubygem-%{gem_name} +Version: 3.12 +Release: 1%{?dist} Group: Development/Languages License: GPLv2 and Ruby and MIT URL: http://docs.seattlerb.org/rdoc/ -Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem -Patch0: rubygem-rdoc-remove-isolate.patch -Requires: rubygems +Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} -Requires: rubygem(rake) -BuildRequires: rubygems +Requires: rubygem(json) => 1.4 +Requires: rubygem(json) < 2 +BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) -BuildRequires: rubygem(rake) +BuildRequires: rubygem(json) => 1.4 +BuildRequires: rubygem(json) < 2 BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description RDoc produces HTML and command-line documentation for Ruby projects. RDoc @@ -41,49 +40,64 @@ Documentation for %{name} %prep %setup -q -c -T -mkdir -p .%{gemdir} -GEM_HOME="%{_builddir}/%{name}-%{version}%{gemdir}" \ -gem install --local -V --force %{SOURCE0} - -pushd .%{geminstdir} -%patch0 -p0 -popd +mkdir -p .%{gem_dir} +gem install --local --install-dir .%{gem_dir} \ + --bindir .%{_bindir} \ + --force %{SOURCE0} %build %install -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* %{buildroot}%{gemdir} +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ + -# FIXME for now just remove the executables as they -# conflict w/ ruby-rdoc -rm -rf %{buildroot}%{gemdir}/bin +mkdir -p %{buildroot}%{_bindir} +cp -a .%{_bindir}/* \ + %{buildroot}%{_bindir}/ + +find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %check -pushd %{buildroot}%{geminstdir} -ruby -I./lib -e "Dir.glob('test/test_*').each {|t| require t}" -rm -rf tmp .autotest .document .gemtest +pushd .%{gem_instdir} +# 73 test fails due to bug in packagin of the gem. +# https://github.com/rdoc/rdoc/issues/98 +# Wrong assumptions about encoding. LANG has to be used. +# https://github.com/rdoc/rdoc/issues/99 +LANG=en_US.utf8 RUBYOPT="-Ilib" testrb test | \ + grep "1473 tests, 3308 assertions, 0 failures, 73 errors, 16 skips" +popd %files -%defattr(-, root, root, -) -%dir %{gemdir}/gems/%{gemname}-%{version}/ -%{gemdir}/gems/%{gemname}-%{version}/lib -%{gemdir}/gems/%{gemname}-%{version}/bin -%doc %{geminstdir}/LICENSE.txt -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%dir %{gem_instdir} +%doc %{gem_instdir}/LICENSE.rdoc +%doc %{gem_instdir}/LEGAL.rdoc +%exclude %{gem_instdir}/.* +%{_bindir}/rdoc +%{_bindir}/ri +%{gem_libdir} +%{gem_instdir}/bin +%exclude %{gem_cache} +%{gem_spec} %files doc -%{gemdir}/doc/%{gemname}-%{version} -%{geminstdir}/History.txt -%{geminstdir}/Manifest.txt -%{geminstdir}/README.txt -%{geminstdir}/RI.txt -%{geminstdir}/Rakefile -%{geminstdir}/test +%doc %{gem_docdir} +%doc %{gem_instdir}/DEVELOPERS.rdoc +%doc %{gem_instdir}/History.rdoc +%doc %{gem_instdir}/Manifest.txt +%doc %{gem_instdir}/README.rdoc +%doc %{gem_instdir}/RI.rdoc +%doc %{gem_instdir}/Rakefile +%doc %{gem_instdir}/TODO.rdoc +%doc %{gem_instdir}/test %changelog +* Tue Feb 07 2012 Vít Ondruch - 3.12-1 +- Rebuilt for Ruby 1.9.3. +- Updated to RDoc 3.12. + * Sat Jan 14 2012 Fedora Release Engineering - 3.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index fe4d760..4be0c06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47c8111247b2c88f99215783f9edd3de rdoc-3.8.gem +80d40156491bc88b1f3677b025d9e254 rdoc-3.12.gem