rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix generated rdoc template issues.

Browse Source
This commit is contained in:
Jun Aruga 2018-08-28 13:50:33 +00:00 committed by Vít Ondruch
parent 936827a34b
commit ec97a0708b
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch Normal file
View File

@ -0,0 +1,34 @@
From d05e6269d4a4dfd701f5ddb3ae34306cba891511 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Fri, 3 Aug 2018 11:35:55 +0200
Subject: [PATCH] Fix indent and typo from moveTimout to moveTimeout.
---
lib/rdoc/generator/template/json_index/js/navigation.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js
index e4126812..43c5118a 100644
--- a/lib/rdoc/generator/template/json_index/js/navigation.js
+++ b/lib/rdoc/generator/template/json_index/js/navigation.js
@@ -59,9 +59,8 @@ Navigation = new function() {
}
break;
case 13: //Event.KEY_RETURN:
- if (this.$current)
- e.preventDefault();
- this.select(this.$current);
+ if (this.$current) e.preventDefault();
+ this.select(this.$current);
break;
}
if (e.ctrlKey && e.shiftKey) this.select(this.$current);
@@ -80,7 +79,7 @@ Navigation = new function() {
var go = function() {
if (!_this.moveTimeout) return;
_this[isDown ? 'moveDown' : 'moveUp']();
- _this.moveTimout = setTimeout(go, 100);
+ _this.moveTimeout = setTimeout(go, 100);
}
this.moveTimeout = setTimeout(go, 200);
}

9
ruby.spec
View File

@ -21,7 +21,7 @@
%endif %endif
%global release 98 %global release 99
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
# The RubyGems library has to stay out of Ruby directory three, since the # The RubyGems library has to stay out of Ruby directory three, since the
@ -145,6 +145,9 @@ Patch15: ruby-2.6.0-library-options-to-MAINLIBS.patch
# Do not require C++ compiler. # Do not require C++ compiler.
# https://github.com/rubygems/rubygems/pull/2367 # https://github.com/rubygems/rubygems/pull/2367
Patch16: ruby-2.5.1-Avoid-need-of-C++-compiler-to-pass-the-test-suite.patch Patch16: ruby-2.5.1-Avoid-need-of-C++-compiler-to-pass-the-test-suite.patch
# https://github.com/ruby/rdoc/commit/d05e6269d4a4dfd701f5ddb3ae34306cba891511
Patch20: ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch
# Fix some OpenSSL 1.1.1 test failures. # Fix some OpenSSL 1.1.1 test failures.
# https://github.com/ruby/openssl/pull/202 # https://github.com/ruby/openssl/pull/202
Patch17: ruby-2.5.1-Test-fixes-for-OpenSSL-1.1.1.patch Patch17: ruby-2.5.1-Test-fixes-for-OpenSSL-1.1.1.patch
@ -540,6 +543,7 @@ rm -rf ext/fiddle/libffi*
%patch17 -p1 %patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1 %patch19 -p1
%patch20 -p1
# Provide an example of usage of the tapset: # Provide an example of usage of the tapset:
cp -a %{SOURCE3} . cp -a %{SOURCE3} .
@ -1089,6 +1093,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
%changelog %changelog
* Tue Aug 28 2018 Jun Aruga <jaruga@redhat.com> - 2.5.1-99
- Fix generated rdoc template issues.
* Mon Aug 13 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-98 * Mon Aug 13 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-98
- Properly execute entire test suite. - Properly execute entire test suite.