Author: aredridel Date: Sat Sep 18 06:34:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.9.2
- add --with-batteries to include json, rubygems and rack
---- Files affected:
packages/ruby:
ruby-lib64.patch (1.3 -> 1.4) , ruby.spec (1.214 -> 1.215)
---- Diffs:
================================================================
Index: packages/ruby/ruby-lib64.patch
diff -u packages/ruby/ruby-lib64.patch:1.3 packages/ruby/ruby-lib64.patch:1.4
--- packages/ruby/ruby-lib64.patch:1.3 Thu Feb 26 00:38:06 2009
+++ packages/ruby/ruby-lib64.patch Sat Sep 18 08:34:02 2010
@@ -1,23 +1,32 @@
---- ruby-1.8.6-preview1-o/configure.in 2007-02-20 01:02:11.000000000 -0700
-+++ ruby-1.8.6-preview1-n/configure.in 2007-02-20 01:20:48.000000000 -0700
-@@ -1241,7 +1241,7 @@
- if test "$rb_cv_missing_fconvert" = yes; then
- AC_DEFINE(MISSING_FCONVERT)
- fi
-- AC_LIBOBJ([x68.o])
-+ AC_LIBOBJ([x68])
- CFLAGS="$CFLAGS -fansi-only"
- XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
- EXEEXT=.x
-
---- ruby-1.8.7-p72/ext/tk/extconf.rb~ 2009-02-26 01:29:16.000000000 +0200
-+++ ruby-1.8.7-p72/ext/tk/extconf.rb 2009-02-26 01:33:54.847015682 +0200
-@@ -182,7 +182,7 @@
+diff -ur ruby-1.9.2-p0-o//configure.in ruby-1.9.2-p0/configure.in
+--- ruby-1.9.2-p0-o//configure.in 2010-08-14 02:11:59.000000000 -0600
++++ ruby-1.9.2-p0/configure.in 2010-09-16 17:16:23.000000000 -0600
+@@ -2222,7 +2222,7 @@
+ RUBY_APPEND_OPTION(CFLAGS, -pipe)
+ ],
+ [human*], [
+- AC_LIBOBJ([x68.o])
++ AC_LIBOBJ([x68])
+ CFLAGS="$CFLAGS -fansi-only"
+ XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+ EXEEXT=.x
+Only in ruby-1.9.2-p0: configure.in.orig
+Only in ruby-1.9.2-p0: configure.in.rej
+Only in ruby-1.9.2-p0: configure.in.rej~
+Only in ruby-1.9.2-p0: configure.in~
+diff -ur ruby-1.9.2-p0-o//ext/tk/extconf.rb ruby-1.9.2-p0/ext/tk/extconf.rb
+--- ruby-1.9.2-p0-o//ext/tk/extconf.rb 2010-08-08 09:01:15.000000000 -0600
++++ ruby-1.9.2-p0/ext/tk/extconf.rb 2010-09-16 17:17:25.000000000 -0600
+@@ -1188,7 +1188,7 @@
def find_X11(*opt_paths)
- default_paths =
-- [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-+ [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib",
"/usr/openwin/lib" ]
- paths = opt_paths.compact.concat(default_paths)
- st = find_library("X11", "XOpenDisplay", *paths)
- unless st
+ defaults =
+- [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib"
]
++ [ "/usr/X11*/lib", "/usr/X11*/lib64", "/usr/lib/X11*", "/usr/lib64/X11*",
"/usr/local/X11*", "/usr/openwin/lib" ]
+ paths = []
+ opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'),
File::FNM_CASEFOLD))}
+ defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'),
File::FNM_CASEFOLD))}
+Only in ruby-1.9.2-p0/ext/tk: extconf.rb.orig
+Only in ruby-1.9.2-p0/ext/tk: extconf.rb.rej
+Only in ruby-1.9.2-p0/ext/tk: extconf.rb.rej~
+Only in ruby-1.9.2-p0/ext/tk: extconf.rb~
================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.214 packages/ruby/ruby.spec:1.215
--- packages/ruby/ruby.spec:1.214 Sun Apr 11 17:02:40 2010
+++ packages/ruby/ruby.spec Sat Sep 18 08:34:02 2010
@@ -4,11 +4,12 @@
%bcond_without doc # skip generating docs (which is time-consuming).
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
#
%define ruby_ver 1.9
%define stdlibdoc_version 0.10.1
-%define patchlevel 378
-%define basever 1.9.1
+%define patchlevel 0
+%define basever 1.9.2
Summary: Ruby - interpreted scripting language
Summary(ja.UTF-8): オブジェクト指向言語Rubyインタプリタ
Summary(pl.UTF-8): Ruby - interpretowany język skryptowy
@@ -16,12 +17,12 @@
Summary(zh_CN.UTF-8): ruby - 一种快速高效的面向对象脚本编程语言
Name: ruby
Version: %{basever}.%{patchlevel}
-Release: 8
+Release: 1
Epoch: 1
License: The Ruby License
Group: Development/Languages
Source0:
ftp://ftp.ruby-lang.org/pub/ruby/%{name}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5: 5922459622a23612eb9b68a3586cb5f8
+# Source0-md5: d8a02cadf57d2571cd4250e248ea7e4b
Source1: http://www.ruby-doc.org/download/%{name}-doc-bundle.tar.gz
# Source1-md5: ad1af0043be98ba1a4f6d0185df63876
Source2:
http://www.ruby-doc.org/download/stdlib/%{name}-doc-stdlib-%{stdlibdoc_version}.tgz
@@ -31,7 +32,7 @@
Source5: %{name}-mode-init.el
Patch0: %{name}-mkmf-shared.patch
Patch1: %{name}-lib64.patch
-Patch2: %{name}-openssl.patch
+#Patch2: %{name}-openssl.patch
URL: http://www.ruby-lang.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -74,8 +75,7 @@
%description -l ja.UTF-8
Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です．Rubyは最初
から純粋なオブジェクト指向言語として設計されていますから，オブジェクト
-指向プログラミングを手軽に行う事が出来ます．もちろん通常の手続き型のプ
-ログラミングも可能です．
+指向プログラミングを手軽に行う事が出来ます．もちろん通常の手続き型のプ ログラミングも可能です．
%description -l pl.UTF-8
Ruby to interpretowany język skryptowy, w sam raz dla łatwego i
@@ -204,7 +204,7 @@
%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -219,8 +219,7 @@
%configure \
--enable-shared \
--enable-pthread \
- --with-ruby-version=minor \
- --enable-frame-address
+ --with-ruby-version=minor
%{__make} -j1
@@ -239,6 +238,7 @@
cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1
cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
+%if %{without batteries}
# packaged separately
rm -r
$RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/{rubygems,rake,json,minitest}
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/*-linux*/json
@@ -246,6 +246,7 @@
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
+%endif
# ruby emacs mode - borrowed from FC-4
%if %{with emacs}
@@ -270,9 +271,16 @@
%defattr(644,root,root,755)
%doc NEWS LEGAL README README.EXT ChangeLog ToDo
%attr(755,root,root) %{_bindir}/ruby
+%if %{with batteries}
+%attr(755,root,root) %{_bindir}/gem
+%attr(755,root,root) %{_bindir}/rake
+%endif
%attr(755,root,root) %{_libdir}/libruby.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libruby.so.1.9
%{_mandir}/man1/ruby.1*
+%if %{with batteries}
+%{_mandir}/man1/rake.1*
+%endif
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{ruby_ver}
%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*
@@ -318,12 +326,19 @@
%{_libdir}/%{name}/%{ruby_ver}/date
%{_libdir}/%{name}/%{ruby_ver}/digest
%{_libdir}/%{name}/%{ruby_ver}/dl
+%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/dl
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/dl/callback.so
%{_libdir}/%{name}/%{ruby_ver}/drb
-%{_libdir}/%{name}/%{ruby_ver}/io
%{_libdir}/%{name}/%{ruby_ver}/irb
+%{_libdir}/%{name}/%{ruby_ver}/minitest
%{_libdir}/%{name}/%{ruby_ver}/net
%{_libdir}/%{name}/%{ruby_ver}/openssl
%{_libdir}/%{name}/%{ruby_ver}/optparse
+%if %{with batteries}
+%{_libdir}/%{name}/%{ruby_ver}/json
+%{_libdir}/%{name}/%{ruby_ver}/rake
+%{_libdir}/%{name}/%{ruby_ver}/rubygems
+%endif
%{_libdir}/%{name}/%{ruby_ver}/racc
%{_libdir}/%{name}/%{ruby_ver}/rbconfig
%{_libdir}/%{name}/%{ruby_ver}/rdoc
@@ -332,6 +347,7 @@
%{_libdir}/%{name}/%{ruby_ver}/ripper
%{_libdir}/%{name}/%{ruby_ver}/rss
%{_libdir}/%{name}/%{ruby_ver}/shell
+%{_libdir}/%{name}/%{ruby_ver}/syck
%{_libdir}/%{name}/%{ruby_ver}/test
%{_libdir}/%{name}/%{ruby_ver}/uri
%{_libdir}/%{name}/%{ruby_ver}/webrick
@@ -351,6 +367,11 @@
%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc
%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc/trans
%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/io
+%if %{with batteries}
+%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/json
+%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/json/ext
+%attr(755,root,root) %{ruby_archdir}/json/ext/*.so
+%endif
%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/mathn
%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/racc
%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/[a-s]*.so
@@ -367,6 +388,11 @@
%{_mandir}/man1/rdoc.1*
%{_mandir}/man1/ri.1*
%{_mandir}/man1/testrb.1*
+%{ruby_archdir}/dl/callback.so
+%{_libdir}/ruby/gems/1.9/specifications/minitest.gemspec
+%{_libdir}/ruby/gems/1.9/specifications/rake.gemspec
+%{_libdir}/ruby/gems/1.9/specifications/rdoc.gemspec
+
%files doc
%defattr(644,root,root,755)
@@ -398,6 +424,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.215 2010/09/18 06:34:02 aredridel
+- 1.9.2
+- add --with-batteries to include json, rubygems and rack
+
Revision 1.214 2010/04/11 15:02:40 arekm
- rel 8; openssl 1.0.0 fix
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby-lib64.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby.spec?r1=1.214&r2=1.215&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
