[rubygem-rdoc] Update to RDoc 4.1.1.

Vít Ondruch vondruch at fedoraproject.org
Tue Jul 8 08:55:52 UTC 2014


commit 8d35e16faf09356cf3205217a79a4f1ca9cd6306
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Jul 8 10:55:59 2014 +0200

    Update to RDoc 4.1.1.

 .gitignore        |    1 +
 rubygem-rdoc.spec |   45 +++++++++++++++++++++++++--------------------
 sources           |    2 +-
 3 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9403b4f..f636a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /rdoc-3.12.1.gem
 /rdoc-4.0.0.gem
 /rdoc-4.0.1.gem
+/rdoc-4.1.1.gem
diff --git a/rubygem-rdoc.spec b/rubygem-rdoc.spec
index f21d5c5..1fc11aa 100644
--- a/rubygem-rdoc.spec
+++ b/rubygem-rdoc.spec
@@ -4,27 +4,19 @@
 
 Summary: RDoc produces HTML and command-line documentation for Ruby projects
 Name: rubygem-%{gem_name}
-Version: 4.0.1
-Release: 3%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2 and Ruby and MIT
 URL: http://docs.seattlerb.org/rdoc/
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: ruby(rubygems)
-Requires: ruby(release)
-Requires: rubygem(json) => 1.4
-Requires: rubygem(json) < 2
-Requires: ruby(irb)
 BuildRequires: rubygems-devel
-BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(minitest) > 5
 BuildRequires: rubygem(json) => 1.4
 BuildRequires: rubygem(json) < 2
 # Execute Rake integration test cases.
 BuildRequires: rubygem(rake)
-BuildRequires: ruby(irb)
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
-Obsoletes:  ruby-rdoc < 1.8.7.357-2
 
 %description
 RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
@@ -39,7 +31,7 @@ Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}
+Documentation for %{name}.
 
 
 %prep
@@ -66,14 +58,23 @@ pushd .%{gem_instdir}
 # RDoc and specify several paths for test dependencies manually. Let's evaluate
 # them by this nice Ruby snippet.
 RUBYOPT=-I`ruby <<EOF
-  specs = %w{rake minitest json psych}.map {|g| Gem::Specification.find_by_name(g)}
-  specs.map! do |s|
-    paths = [s.gem_dir]
-    paths << s.ext_dir unless s.extensions.empty?
-    paths.map {|p| File.join p, s.require_paths.first}
+  #specs = %w{rake minitest json psych}.map {|g| Gem::Specification.find_by_name(g)}
+  specs = %w{rake minitest json}.map {|g| Gem::Specification.find_by_name(g)}
+  paths = specs.map {|s| s.full_require_paths}
+  puts paths.join(':')
+EOF`:lib GEM_PATH= ruby - << \EOF
+  # Avoid RubyGems dependency to explicitely load minitest gem.
+  # https://github.com/rdoc/rdoc/issues/313
+  alias orig_gem gem
+
+  def gem(gem_name, *requirements)
+    orig_gem(gem_name, requirements) unless gem_name == 'minitest'
   end
-  puts specs.join(':')
-EOF`:lib GEM_PATH= testrb test
+
+  Dir.glob "./test/**/test_*.rb", &method(:require)
+EOF
+
+
 popd
 
 %files
@@ -90,7 +91,8 @@ popd
 
 %files doc
 %doc %{gem_docdir}
-%doc %{gem_instdir}/DEVELOPERS.rdoc
+%doc %{gem_instdir}/CONTRIBUTING.rdoc
+%doc %{gem_instdir}/Example*
 %doc %{gem_instdir}/History.rdoc
 %doc %{gem_instdir}/Manifest.txt
 %doc %{gem_instdir}/README.rdoc
@@ -102,6 +104,9 @@ popd
 
 
 %changelog
+* Mon Jul 07 2014 Vít Ondruch <vondruch at redhat.com> - 4.1.1-1
+- Update to RDoc 4.1.1.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 2675995..44eb9df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf1b53ae65f19e956c31023c8648b8b8  rdoc-4.0.1.gem
+214a3861d2437561f91cc8241de609f5  rdoc-4.1.1.gem


More information about the scm-commits mailing list