Merge branch 'master' into new-paths

Conflicts:
	ruby.spec

diff --cc ruby.spec
index 497d5a08d9dc732f41b62ddee9f7c7cd1074a4ea,80c89bcf24762148a90c6a0ea92528bdbe1a92bc..e9db7c3f6c22d249d7f89497543049b9e105e93a
--- 1/ruby.spec
--- 2/ruby.spec
+++ b/ruby.spec
@@@ -2,32 -2,16 +2,16 @@@
  # TODO:
  #     - include ext/ in docs
  #     - replace ri with fastri
--#     - patch ri to search multiple indexes (one per package), so RPMs can
--#       install ri docs
- # - drop emacs
- #* Mon Jul 12 2010 Mohammed Morsi <mmorsi@redhat.com> - 1.8.7.299-3
- #- updated packaged based on feedback (from mtasaka)
- #- added comments to all patches / sources
- #- obsoleted ruby-mode, as it's now provided by the emacs package itself
- #- readded missing documentation
- #- various small compatability/regression fixes
- #* Thu Jun 24 2010 Mohammed Morsi <mmorsi@redhat.com> - 1.8.7.299-1
- #- integrate more of jmeyering's and mtaska's feedback
- #- removed emacs bits that are now shipped with the emacs package
- #- various patch and spec cleanup
- #- rebased to ruby 1.8.7 patch 299, removed patches no longer needed:
- #   ruby-1.8.7-openssl-1.0.patch, ruby-1.8.7-rb_gc_guard_ptr-optimization.patch
- 
++#     - patch ri to search multiple indexes (one per package), so RPMs can install ri docs
  #
  # Conditional build:
  %bcond_without        doc             # skip (time-consuming) docs generating; intended for speed up test builds
- %bcond_without        emacs           # skip building package with ruby-mode for emacs
  %bcond_without        tk              # skip building package with Tk bindings
  %bcond_without        batteries       # Don't include rubygems, json or rake
 +%bcond_without        verpath # LOAD_PATH with version number
  %bcond_with   bootstrap       # build bootstrap version
  
 -%define               ruby_ver        1.9
 +%define               ruby_version    1.9
  %define               basever         1.9.3
  %define               patchlevel      392
  %define               doc_version     1_9_3
@@@ -362,41 -276,18 +332,21 @@@ cp -Rf sample/* $RPM_BUILD_ROOT%{_examp
  cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
  cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
  
+ %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/html
+ 
  %if %{without batteries}
  # packaged separately
 -%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/{rubygems,rake,json,tasks}
 -%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/*-linux*/json
 -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/{rake,rubygems,json}.rb
 +%{__rm} -r $RPM_BUILD_ROOT%{ruby_libdir}/%{ruby_version}/{rubygems,rake,json,tasks}
 +%{__rm} -r $RPM_BUILD_ROOT%{ruby_libarchdir}/%{ruby_version}/json
 +%{__rm} $RPM_BUILD_ROOT%{ruby_libdir}/%{ruby_version}/{rake,rubygems,json}.rb
  %{__rm} $RPM_BUILD_ROOT%{_bindir}/{gem,rake}
  %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rake*
 -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/ri/%{ruby_ver}/system/JSON
 +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/ri/%{ruby_version}/system/JSON
  %endif
  
- # ruby emacs mode - borrowed from FC-4
- %if %{with emacs}
- install -d $RPM_BUILD_ROOT%{_emacs_lispdir}/{%{name}-mode,site-start.d}
- cp -a misc/*.el $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode
- %{__rm} $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode/rubydb2x.el*
- install -p %{SOURCE6} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
- cat << 'EOF' > path.el
- (setq load-path (cons "." load-path) byte-compile-warnings nil)
- EOF
- emacs --no-site-file -q -batch -l path.el -f batch-byte-compile $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode/*.el
- %{__rm} path.el*
- %endif
- 
 +# too much .ri
 +rm -rf $RPM_BUILD_ROOT%{_datadir}/ri
- rm -rf $RPM_BUILD_ROOT%{_docdir}/ruby/html
- #rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
- rm -rf $RPM_BUILD_ROOT%{_docdir}/ruby/html
- rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode/inf-ruby.el
- rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode/rdoc-mode.el
- rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode/ruby-electric.el
- rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode/ruby-mode.el
- rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode/ruby-style.el
- rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode/rubydb3x.el
 +
  %clean
  rm -rf $RPM_BUILD_ROOT