- updated ia64 patch

- added onig-types patch, oniguruma is back on all archs

Changed files:
    ruby.spec -> 1.83

diff --git a/ruby.spec b/ruby.spec
index 08cb915f89bd4bb3c8fac3e2e07d59c6d68cfa9a..b4e486aff72fd085c5e131b8db2ed97af94e86ca 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -28,7 +28,8 @@ Source5:      http://www.geocities.jp/kosako1/oniguruma/archive/onigd20040821.tar.gz
 # Source5-md5: ed8e12118b0d39d6d8581128ad36276f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-LIB_PREFIX.patch
 # Source5-md5: ed8e12118b0d39d6d8581128ad36276f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-LIB_PREFIX.patch

-#Patch2:               %{name}-ia64.patch
+Patch2:                %{name}-ia64.patch
+Patch3:                %{name}-onig-types.patch

 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -117,20 +118,19 @@ Biblioteki statyczne Ruby.
 %setup -q -a1 -a2 -a3 -a5
 %patch0 -p1
 %patch1 -p1
 %setup -q -a1 -a2 -a3 -a5
 %patch0 -p1
 %patch1 -p1

-#%patch2 -p1
+%patch2 -p1
+%patch3 -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 .
 
 
 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 ..
 cd oniguruma
 %configure \
        --with-rubydir=..
 %{__make} 18
 cd ..

-%endif

 
 %{__autoconf}
 %configure \
 
 %{__autoconf}
 %configure \