X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=b5d4632ce66a2d7e1cb71d75191c9e75f968f1ae;hb=d99a438243009f5c413c9e17e47e7832e5687d6a;hp=32e631d87af86aa6f73d6de63ab2b3ba633e0610;hpb=584b8bcb48e00b1245579939fc351aa0979cbd63;p=packages%2Fruby.git

diff --git a/ruby.spec b/ruby.spec
index 32e631d..b5d4632 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,20 +1,18 @@
 %define		ruby_ridir	%{_datadir}/ri/1.8/system
-
-%define		pre		preview2
-
 Summary:	Ruby - interpreted scripting language
 Summary(ja):	¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¸À¸ìRuby¥¤¥ó¥¿¥×¥ê¥¿
 Summary(pl):	Ruby - interpretowany jêzyk skryptowy
 Summary(pt_BR):	Linguagem de script orientada a objeto
 Summary(zh_CN):	ruby - Ò»ÖÖ¿ìËÙ¸ßЧµÄÃæÏò¶ÔÏó½Å±¾±à³ÌÓïÑÔ
 Name:		ruby
-Version:	1.8.2
-Release:	1.%{pre}.2
+Version:	1.8.4
+Release:	1.1
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
-Source0:	ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-%{version}-%{pre}.tar.gz
-# Source0-md5:	f40dae2bd20fd41d681197f1229f25e0
+#Source0:	ftp://ftp.ruby-lang.org/pub/ruby/stable-snapshot.tar.gz
+Source0:	ftp://ftp.ruby-lang.org/pub/ruby/%{name}-%{version}.tar.gz
+# Source0-md5:	bd8c2e593e1fa4b01fd98eaf016329bb
 Source1:	http://www.ibiblio.org/pub/languages/ruby/doc/%{name}-texi-1.4-en.tar.gz
 # Source1-md5:	839fda4af52b5c5c6d21f879f7fc62bf
 Source2:	http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/%{name}-uguide-981227.tar.gz
@@ -22,22 +20,32 @@ Source2:	http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/%{name}-uguide-981227.t
 Source3:	http://www.ibiblio.org/pub/languages/ruby/doc/%{name}faq-990927.tar.gz
 # Source3-md5:	634c25b14e19925d10af3720d72e8741
 Source4:	irb.1
-Source5:	http://www.geocities.jp/kosako1/oniguruma/archive/onigd20040821.tar.gz
-# Source5-md5:	ed8e12118b0d39d6d8581128ad36276f
+Source5:	http://www.geocities.jp/kosako3/oniguruma/archive/onigd2_5_0.tar.gz
+# Source5-md5:	40cb52605c7292373d8dfd11015cb687
+%define stdlibdoc_version	0.9.13
+Source6:	http://www.ruby-doc.org/downloads/stdlib/%{name}-doc-stdlib-%{stdlibdoc_version}.tgz
+# Source6-md5:	39dab8db652dad23ad8951f851549f06
+Source7:	http://www.ruby-doc.org/downloads/Ruby-1.8.1_ri_data.zip
+# Source7-md5:	96e97cdfa55ed197e0e6c39159394c82
+Source8:	macros.%{name}
+Source9:	erb.1
+Source10:	rdoc.1
+Source11:	ri.1
+Source12:	testrb.1
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-LIB_PREFIX.patch
-Patch2:		%{name}-ia64.patch
-Patch3:		%{name}-onig-types.patch
-Patch4:		%{name}-mkmf-shared.patch
+#Patch3:		%{name}-mkmf-shared.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	db-devel
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	texinfo
 BuildRequires:	tk-devel
-Requires(post,postun): /sbin/ldconfig
+BuildRequires:	unzip
+Requires(post,postun):	/sbin/ldconfig
 Obsoletes:	ruby-doc
 Obsoletes:	rdoc
 Obsoletes:	ruby-REXML
@@ -55,16 +63,15 @@ object-oriented programming. It has many features to process text
 files and to do system management tasks (as in Perl). It is simple,
 straight-forward, extensible, and portable.
 
+This package contains only shared library and ruby interpreter. To get
+full-functional ruby environment install ruby-modules package.
+
 %description -l ja
 Ruby¤Ï¥·¥ó¥×¥ë¤«¤Ä¶¯ÎϤʥª¥Ö¥¸¥§¥¯¥È»Ø¸þ¥¹¥¯¥ê¥×¥È¸À¸ì¤Ç¤¹¡¥Ruby¤ÏºÇ½é
 ¤«¤é½ã¿è¤Ê¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¸À¸ì¤È¤·¤ÆÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¤«¤é¡¤¥ª¥Ö¥¸¥§¥¯¥È
 »Ø¸þ¥×¥í¥°¥é¥ß¥ó¥°¤ò¼ê·Ú¤Ë¹Ô¤¦»ö¤¬½ÐÍè¤Þ¤¹¡¥¤â¤Á¤í¤óÄ̾ï¤Î¼ê³¤­·¿¤Î¥×
 ¥í¥°¥é¥ß¥ó¥°¤â²Äǽ¤Ç¤¹¡¥
 
-Ruby¤Ï¥Æ¥­¥¹¥È½èÍý´Ø·¸¤ÎǽÎϤʤɤËÍ¥¤ì¡¤Perl¤ÈƱ¤¸¤¯¤é¤¤¶¯ÎϤǤ¹¡¥¤µ¤é
-¤Ë¥·¥ó¥×¥ë¤Êʸˡ¤È¡¤Îã³°½èÍý¤ä¥¤¥Æ¥ì¡¼¥¿¤Ê¤É¤Îµ¡¹½¤Ë¤è¤Ã¤Æ¡¤¤è¤êʬ¤«¤ê
-¤ä¤¹¤¤¥×¥í¥°¥é¥ß¥ó¥°¤¬½ÐÍè¤Þ¤¹¡¥
-
 %description -l pl
 Ruby to interpretowany jêzyk skryptowy, w sam raz dla ³atwego i
 szybkiego pisania zorientowanych obiektowo programów. Ma wiele funkcji
@@ -72,16 +79,41 @@ u
 zwi±zanych z zarz±dzaniem systemu (podobnie jak Perl). Jest prosty,
 rozszerzalny i przeno¶ny.
 
+Ten pakiet zawiera tylko bibliotekê dzielon± i interpreter ruby.
+Zainstaluj pakiet ruby-modules, je¿eli potrzebujesz w pe³ni
+funkcjonalnego ¶rodowiska ruby.
+
 %description -l pt_BR
-Ruby é uma linguagem de script interpretada de programação
-orientada a objeto. Possui diversas características para
-processamento de texto. É simples, extensível e direta.
+Ruby é uma linguagem de script interpretada de programação orientada a
+objeto. Possui diversas características para processamento de texto. É
+simples, extensível e direta.
+
+%package modules
+Summary:	Ruby standard modules and utilities
+Group:		Development/Languages
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description modules
+Ruby standard modules and utilities:
+- erb - Tiny eRuby
+- rdoc - documentation tool for source code
+- irb - interactive Ruby
+- ri - Ruby interactive reference
+- testrb - automatic runnter for Test::Unit of Ruby
+
+%description modules -l pl
+Standardowe modu³y i narzêdzia Ruby:
+- erb - ma³y eRuby
+- rdoc - narzêdzie do dokumentowania kodu ¼ród³owego
+- irb - interaktywny Ruby
+- ri - interaktywna dokumentacja Ruby
+- testrb - automatyczny runnter dla Ruby Test::Unit
 
 %package tk
 Summary:	Ruby/Tk bindings
 Summary(pl):	Wi±zania Ruby/Tk
 Group:		Development/Languages
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description tk
 This pachage contains Ruby/Tk bindings.
@@ -93,7 +125,7 @@ Ten pakiet zawiera wi
 Summary:	Ruby development libraries
 Summary(pl):	Biblioteki programistyczne interpretera jêzyka Ruby
 Group:		Development/Languages
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description devel
 Ruby development libraries.
@@ -105,21 +137,54 @@ Biblioteki programistyczne interpretera j
 Summary:	Ruby static libraries
 Summary(pl):	Biblioteki statyczne Ruby
 Group:		Development/Languages
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Ruby static libraries.
 
-%description devel -l pl
+%description static -l pl
 Biblioteki statyczne Ruby.
 
+%package doc 
+Summary:	Ruby HTML documentation
+Summary(pl):	Dokumentacja HTML do Ruby
+Group:		Documentation
+
+%description doc
+Ruby HTML documentation: FAQ, guide, core and standard library.
+
+%description doc -l pl
+Dokumentacja HTML do Ruby: FAQ, przewodnik, dokumentacja dla core i
+stdlib.
+
+%package doc-ri
+Summary:	Ruby ri documentation
+Summary(pl):	Dokumentacja Ruby w formacie ri
+Group:		Documentation
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+
+%description doc-ri
+Ruby ri documentation.
+
+%description doc-ri -l pl
+Dokumentacja Ruby w formacie ri.
+
+%package examples
+Summary:	Ruby examples
+Summary(pl):	Przyk³ady Ruby
+Group:		Development/Languages
+
+%description examples
+Ruby examples.
+
+%description examples -l pl
+Przyk³ady programów Ruby.
+
 %prep
-%setup -q -a1 -a2 -a3 -a5
+%setup -q -a1 -a2 -a3 -a5 -a6 -a7
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
 
 find . -name '*.rb' -or -name '*.cgi' -or -name '*.test' | xargs perl -pi -e "s#/usr/local/bin#bin#"
 
@@ -137,31 +202,64 @@ cd ..
 	--enable-shared \
 	--enable-pthread \
 	--with-X11-lib=/usr/X11R6/%{_lib}
-%{__make}
 
+%{__make}
 %{__make} info -C %{name}-texi-1.4-en
 
 mkdir rdoc
 
-./miniruby -I lib bin/rdoc -o rdoc/core .
-./miniruby -I lib bin/rdoc -o rdoc/stdlib lib ext/*/
-./miniruby -I lib -I ext/syck bin/rdoc --ri -o ri lib ext/*/
+RUBYLIB="lib:`find ext/ .ext/ -type d | tr '\n' ':'`"
+export RUBYLIB
+
+LD_LIBRARY_PATH=. ./ruby bin/rdoc --inline-source --op rdoc/core \
+	array.c bignum.c class.c compar.c dir.c dln.c dmyext.c enum.c \
+	error.c eval.c file.c gc.c hash.c inits.c io.c lex.c main.c marshal.c \
+	math.c numeric.c object.c pack.c parse.c prec.c process.c random.c range.c \
+	re.c regex.c ruby.c signal.c sprintf.c st.c string.c struct.c time.c util.c \
+	variable.c version.c \
+	lib/English.rb lib/abbrev.rb lib/base64.rb lib/benchmark.rb lib/cgi.rb \
+	lib/cgi/session.rb lib/complex.rb lib/date.rb lib/fileutils.rb lib/find.rb \
+	lib/generator.rb lib/logger.rb lib/matrix.rb lib/observer.rb \
+	lib/pathname.rb lib/set.rb lib/shellwords.rb lib/singleton.rb \
+	lib/tempfile.rb lib/test/unit.rb lib/thread.rb lib/thwait.rb \
+	lib/time.rb lib/yaml.rb
+
+mv ruby-doc-stdlib-%{stdlibdoc_version}/stdlib rdoc/stdlib
+mv ri/1.8/site ri/1.8/system
+
+LD_LIBRARY_PATH=. ./ruby bin/rdoc --ri -o ri/1.8/system \
+	array.c bignum.c class.c compar.c dir.c dln.c \
+	dmyext.c enum.c error.c eval.c file.c gc.c hash.c inits.c io.c lex.c main.c \
+	marshal.c math.c numeric.c object.c pack.c parse.c prec.c process.c \
+	random.c range.c re.c regex.c ruby.c signal.c sprintf.c st.c string.c \
+	struct.c time.c util.c variable.c version.c \
+	lib/English.rb lib/abbrev.rb lib/base64.rb lib/benchmark.rb lib/cgi.rb \
+	lib/cgi/session.rb lib/complex.rb lib/date.rb lib/fileutils.rb lib/find.rb \
+	lib/generator.rb lib/logger.rb lib/matrix.rb lib/observer.rb lib/pathname.rb \
+	lib/set.rb lib/shellwords.rb lib/singleton.rb lib/tempfile.rb \
+	lib/test/unit.rb lib/thread.rb lib/thwait.rb lib/time.rb lib/yaml.rb
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1,%{_examplesdir}/%{name}-%{version},%{ruby_ridir}}
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1,%{_examplesdir}/%{name}-%{version},%{ruby_ridir},%{_libdir}/rpm,%{_datadir}/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -a sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -Rf sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install %{name}-texi-1.4-en/ruby.info* $RPM_BUILD_ROOT%{_infodir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man1
 
 mv -f ruby-uguide guide
 mv -f rubyfaq faq
 
-cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -Rf ri/1.8/system/* $RPM_BUILD_ROOT%{ruby_ridir}
+
+install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -176,10 +274,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc guide faq misc README README.EXT ChangeLog ToDo
-%doc rdoc
-%attr(755,root,root) %{_bindir}/*
+%doc README README.EXT ChangeLog ToDo
+%attr(755,root,root) %{_bindir}/ruby
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+# below - what's for? (empty)
+#%%dir %{_datadir}/%{name}
+%{_mandir}/man1/ruby.1*
+%{_infodir}/*.info*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/%{name}/1.8/*/*.h
+%{_libdir}/rpm/macros.ruby
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
+
+%files tk
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/1.8/tcltk.rb
+%{_libdir}/%{name}/1.8/tk*.rb
+%{_libdir}/%{name}/1.8/tk
+%{_libdir}/%{name}/1.8/tkextlib
+%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/t*.so
+
+%files modules
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/erb
+%attr(755,root,root) %{_bindir}/irb
+%attr(755,root,root) %{_bindir}/rdoc
+%attr(755,root,root) %{_bindir}/ri
+%attr(755,root,root) %{_bindir}/testrb
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/1.8
 %{_libdir}/%{name}/1.8/bigdecimal
@@ -218,6 +345,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/1.8/tsort.rb
 %{_libdir}/%{name}/1.8/[u-z]*.rb
 %dir %{_libdir}/%{name}/1.8/*-linux*
+%dir %{_libdir}/%{name}/1.8/*-linux*/digest
+%dir %{_libdir}/%{name}/1.8/*-linux*/io
+%dir %{_libdir}/%{name}/1.8/*-linux*/racc
 %attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/[a-s]*.so
 %attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/[u-z]*.so
 %attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/digest/*.so
@@ -227,25 +357,23 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_ulibdir}/%{name}/site_ruby
 %dir %{_ulibdir}/%{name}/site_ruby/1.8
 %dir %{_ulibdir}/%{name}/site_ruby/1.8/*-linux*
-%dir %{ruby_ridir}
-%{ruby_ridir}/*
-%{_mandir}/*/*
-%{_infodir}/*.info*
-%{_examplesdir}/%{name}-%{version}
-
-%files devel
+%{_mandir}/man1/erb.1*
+%{_mandir}/man1/irb.1*
+%{_mandir}/man1/rdoc.1*
+%{_mandir}/man1/ri.1*
+%{_mandir}/man1/testrb.1*
+%dir %{_datadir}/ri
+%dir %{_datadir}/ri/1.8
+%dir %{_datadir}/ri/1.8/system
+
+%files doc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/%{name}/1.8/*/*.h
+%doc faq guide misc rdoc
 
-%files static
+%files doc-ri
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_datadir}/ri/1.8/system/*
 
-%files tk
+%files examples
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/1.8/tcltk.rb
-%{_libdir}/%{name}/1.8/tk*.rb
-%{_libdir}/%{name}/1.8/tk
-%{_libdir}/%{name}/1.8/tkextlib
-%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/t*.so
+%{_examplesdir}/%{name}-%{version}