X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=cdfb2a2707615cd6ad7af51f1026847ee53f3181;hb=1b39e8e22a3dd0b855f903aac5744de6864ab6b1;hp=310f755a7150bfa58fa9868ea7e8d25750f67f93;hpb=310e7a2b35d5970092676d62b9ef37aa1a24d4e7;p=packages%2Fruby.git

diff --git a/ruby.spec b/ruby.spec
index 310f755..cdfb2a2 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -19,7 +19,7 @@
 %define		rel		1
 %define		ruby_version	2.0
 %define		basever		2.0.0
-%define		patchlevel	481
+%define		patchlevel	643
 
 %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define		doc_version	2_0_0
@@ -48,8 +48,8 @@ Epoch:		1
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License:	(Ruby or BSD) and Public Domain
 Group:		Development/Languages
-Source0:	ftp://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5:	ea406a8d415a1a5d8365596d4288f3da
+Source0:	https://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
+# Source0-md5:	1390888cac6cd175e6f164eff378cdde
 Source1:	http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
 # Source1-md5:	ad1af0043be98ba1a4f6d0185df63876
 Source2:	http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
@@ -67,10 +67,11 @@ Patch2:		fix-bison-invocation.patch
 Patch3:		mkmf-verbose.patch
 Patch4:		strip-ccache.patch
 Patch5:		duplicated-paths.patch
-Patch6:		DESTDIR.patch
 Patch7:		empty-ruby-version.patch
 Patch8:		rubygems-2.0.0-binary-extensions.patch
 Patch9:		custom-rubygems-location.patch
+Patch10:	%{oname}-posixsh.patch
+Patch11:	x32-asm.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -192,6 +193,7 @@ Obsoletes:	ruby-minitest <= 1.5.0
 %endif
 # FIXME later
 Provides:	ruby(abi) = %{ruby_version}
+%requires_ge_to	openssl	openssl-devel
 
 %description modules
 Ruby standard modules and utilities:
@@ -316,10 +318,8 @@ Epoch:		0
 License:	GPL v2 and Ruby and MIT
 Group:		Development/Libraries
 Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{rel}
-Requires:	%{name}-json
-# should the above be versioned?
-# = 0:%{json_ver}-%{basever}.%{patchlevel}.%{rel}
-Epoch:		0
+Requires:	%{name}-irb >= %{irb_ver}
+Requires:	%{name}-json >= %{json_ver}
 Obsoletes:	rdoc <= 0.9.0
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
@@ -430,10 +430,11 @@ Biblioteka JSON dla języka Ruby.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}
@@ -726,7 +727,6 @@ rm -rf $RPM_BUILD_ROOT
 %files rubygems
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gem%{ruby_suffix}
-%dir %{rubygems_dir}
 %{rubygems_dir}/rubygems
 %{rubygems_dir}/rubygems.rb
 %{rubygems_dir}/ubygems.rb
@@ -737,6 +737,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rake%{ruby_suffix}
 %{_mandir}/man1/rake%{ruby_suffix}.1*
 %{ruby_libdir}/rake
+%{ruby_libdir}/rake.rb
 %dir %{gem_dir}/gems/rake-%{rake_ver}
 %{gem_dir}/gems/rake-%{rake_ver}/lib
 %dir %{gem_dir}/gems/rake-%{rake_ver}/bin
@@ -789,7 +790,66 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/webrick
 %{ruby_libdir}/xmlrpc
 %{ruby_libdir}/yaml
-%{ruby_libdir}/[A-Za-s]*.rb
+
+%{ruby_libdir}/English.rb
+%{ruby_libdir}/abbrev.rb
+%{ruby_libdir}/base64.rb
+%{ruby_libdir}/benchmark.rb
+%{ruby_libdir}/cgi.rb
+%{ruby_libdir}/cmath.rb
+%{ruby_libdir}/complex.rb
+%{ruby_libdir}/csv.rb
+%{ruby_libdir}/date.rb
+%{ruby_libdir}/debug.rb
+%{ruby_libdir}/delegate.rb
+%{ruby_libdir}/digest.rb
+%{ruby_libdir}/dl.rb
+%{ruby_libdir}/drb.rb
+%{ruby_libdir}/e2mmap.rb
+%{ruby_libdir}/erb.rb
+%{ruby_libdir}/expect.rb
+%{ruby_libdir}/fiddle.rb
+%{ruby_libdir}/fileutils.rb
+%{ruby_libdir}/find.rb
+%{ruby_libdir}/forwardable.rb
+%{ruby_libdir}/getoptlong.rb
+%{ruby_libdir}/gserver.rb
+%{ruby_libdir}/ipaddr.rb
+%{ruby_libdir}/json.rb
+%{ruby_libdir}/kconv.rb
+%{ruby_libdir}/logger.rb
+%{ruby_libdir}/mathn.rb
+%{ruby_libdir}/matrix.rb
+%{ruby_libdir}/monitor.rb
+%{ruby_libdir}/mutex_m.rb
+%{ruby_libdir}/observer.rb
+%{ruby_libdir}/open-uri.rb
+%{ruby_libdir}/open3.rb
+%{ruby_libdir}/openssl.rb
+%{ruby_libdir}/optparse.rb
+%{ruby_libdir}/ostruct.rb
+%{ruby_libdir}/pathname.rb
+%{ruby_libdir}/pp.rb
+%{ruby_libdir}/prettyprint.rb
+%{ruby_libdir}/prime.rb
+%{ruby_libdir}/profile.rb
+%{ruby_libdir}/profiler.rb
+%{ruby_libdir}/pstore.rb
+%{ruby_libdir}/psych.rb
+%{ruby_libdir}/rational.rb
+%{ruby_libdir}/rdoc.rb
+%{ruby_libdir}/resolv-replace.rb
+%{ruby_libdir}/resolv.rb
+%{ruby_libdir}/ripper.rb
+%{ruby_libdir}/rss.rb
+%{ruby_libdir}/scanf.rb
+%{ruby_libdir}/securerandom.rb
+%{ruby_libdir}/set.rb
+%{ruby_libdir}/shell.rb
+%{ruby_libdir}/shellwords.rb
+%{ruby_libdir}/singleton.rb
+%{ruby_libdir}/socket.rb
+%{ruby_libdir}/sync.rb
 %{ruby_libdir}/tempfile.rb
 %{ruby_libdir}/thread.rb
 %{ruby_libdir}/thwait.rb
@@ -798,7 +858,13 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/tmpdir.rb
 %{ruby_libdir}/tracer.rb
 %{ruby_libdir}/tsort.rb
-%{ruby_libdir}/[u-z]*.rb
+%{ruby_libdir}/un.rb
+%{ruby_libdir}/uri.rb
+%{ruby_libdir}/weakref.rb
+%{ruby_libdir}/webrick.rb
+%{ruby_libdir}/xmlrpc.rb
+%{ruby_libdir}/yaml.rb
+
 %if %{with batteries}
 %exclude %{ruby_libdir}/rubygems.rb
 %exclude %{ruby_libdir}/ubygems.rb
@@ -807,8 +873,37 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %exclude %{ruby_libdir}/irb.rb
 %exclude %{ruby_libdir}/mkmf.rb
-%attr(755,root,root) %{ruby_archdir}/[a-s]*.so
-%attr(755,root,root) %{ruby_archdir}/[u-z]*.so
+%exclude %{ruby_libdir}/rake.rb
+
+%{ruby_archdir}/rbconfig.rb
+%attr(755,root,root) %{ruby_archdir}/bigdecimal.so
+%attr(755,root,root) %{ruby_archdir}/continuation.so
+%attr(755,root,root) %{ruby_archdir}/coverage.so
+%attr(755,root,root) %{ruby_archdir}/curses.so
+%attr(755,root,root) %{ruby_archdir}/date_core.so
+%attr(755,root,root) %{ruby_archdir}/dbm.so
+%attr(755,root,root) %{ruby_archdir}/digest.so
+%attr(755,root,root) %{ruby_archdir}/dl.so
+%attr(755,root,root) %{ruby_archdir}/etc.so
+%attr(755,root,root) %{ruby_archdir}/fcntl.so
+%attr(755,root,root) %{ruby_archdir}/fiber.so
+%attr(755,root,root) %{ruby_archdir}/fiddle.so
+%attr(755,root,root) %{ruby_archdir}/gdbm.so
+%attr(755,root,root) %{ruby_archdir}/nkf.so
+%attr(755,root,root) %{ruby_archdir}/objspace.so
+%attr(755,root,root) %{ruby_archdir}/openssl.so
+%attr(755,root,root) %{ruby_archdir}/pathname.so
+%attr(755,root,root) %{ruby_archdir}/psych.so
+%attr(755,root,root) %{ruby_archdir}/pty.so
+%attr(755,root,root) %{ruby_archdir}/readline.so
+%attr(755,root,root) %{ruby_archdir}/ripper.so
+%attr(755,root,root) %{ruby_archdir}/sdbm.so
+%attr(755,root,root) %{ruby_archdir}/socket.so
+%attr(755,root,root) %{ruby_archdir}/stringio.so
+%attr(755,root,root) %{ruby_archdir}/strscan.so
+%attr(755,root,root) %{ruby_archdir}/syslog.so
+%attr(755,root,root) %{ruby_archdir}/zlib.so
+
 %dir %{ruby_archdir}/digest
 %attr(755,root,root) %{ruby_archdir}/digest/*.so
 %dir %{ruby_archdir}/dl
@@ -823,7 +918,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/mathn/*.so
 %dir %{ruby_archdir}/racc
 %attr(755,root,root) %{ruby_archdir}/racc/*.so
-%{ruby_archdir}/rbconfig.rb
 
 # bigdecimal
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec