- up to 1.8.2-preview2 again

- remove oniguruma from sparc and alpha

Changed files:
    ruby.spec -> 1.78

diff --git a/ruby.spec b/ruby.spec
index 2c740451450a1f165ac55dfd70547db18b999587..2295d667b24c6abb375d4bfd18fb5aa672347863 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -5,13 +5,14 @@ Summary(pl):  Ruby - interpretowany j
 Summary(pt_BR):        Linguagem de script orientada a objeto
 Summary(zh_CN):        ruby - Ò»ÖÖ¿ìËÙ¸ßЧµÄÃæÏò¶ÔÏó½Å±¾±à³ÌÓïÑÔ
 Name:          ruby
-Version:       1.8.1
-Release:       1
+%define pre preview2
+Version:       1.8.2
+Release:       1.%{pre}.1
 Epoch:         1
 License:       The Ruby License
 Group:         Development/Languages
-Source0:       ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-%{version}.tar.gz
-# Source0-md5: 5d52c7d0e6a6eb6e3bc68d77e794898e
+Source0:       ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-%{version}-%{pre}.tar.gz
+# Source0-md5: f40dae2bd20fd41d681197f1229f25e0
 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
@@ -23,7 +24,7 @@ Source5:      http://www.geocities.jp/kosako1/oniguruma/archive/onigd20040821.tar.gz
 # Source5-md5: ed8e12118b0d39d6d8581128ad36276f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-LIB_PREFIX.patch
-Patch2:                %{name}-ia64.patch
+#Patch2:               %{name}-ia64.patch
 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -112,17 +113,20 @@ Biblioteki statyczne Ruby.
 %setup -q -a1 -a2 -a3 -a5
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 find . -name '*.rb' -or -name '*.cgi' -or -name '*.test' | xargs perl -pi -e "s#/usr/local/bin#bin#"
 
 %build
 cp -f /usr/share/automake/config.sub .
+
+%ifnarch alpha sparc
 cd oniguruma
 %configure \
        --with-rubydir=..
 %{__make} 18
 cd ..
+%endif
 
 %{__autoconf}
 %configure \
@@ -133,8 +137,8 @@ cd ..
 
 %{__make} info -C %{name}-texi-1.4-en
 
-#./miniruby -I lib bin/rdoc -o rdoc
-#./miniruby -I lib -I ext/syck bin/rdoc --ri -o ri
+./miniruby -I lib bin/rdoc -o rdoc
+./miniruby -I lib -I ext/syck bin/rdoc --ri -o ri
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -150,7 +154,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
 mv -f ruby-uguide guide
 mv -f rubyfaq faq
 
-#cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc guide faq misc README README.EXT ChangeLog ToDo 
-#%doc rdoc
+%doc rdoc
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/%{name}
@@ -185,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/1.8/rdoc
 %{_libdir}/%{name}/1.8/rexml
 %{_libdir}/%{name}/1.8/rinda
-#%{_libdir}/%{name}/1.8/rss
+%{_libdir}/%{name}/1.8/rss
 %{_libdir}/%{name}/1.8/runit
 %{_libdir}/%{name}/1.8/shell
 %{_libdir}/%{name}/1.8/soap
@@ -217,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_ulibdir}/%{name}/site_ruby/1.8
 %dir %{_ulibdir}/%{name}/site_ruby/1.8/*-linux*
 %dir %{ruby_ridir}
-#%{ruby_ridir}/*
+%{ruby_ridir}/*
 %{_mandir}/*/*
 %{_infodir}/*.info*
 %{_examplesdir}/%{name}-%{version}
@@ -235,6 +239,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%{_libdir}/%{name}/1.8/tk
+%{_libdir}/%{name}/1.8/tkextlib
 %attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/t*.so