- added ac25x patch needed for autoconf 2.53

- removed workaround for ac - mkconfig.rb supports ac 2.52 now
- longer info patch, fixed info pages are back
- new %%doc

Changed files:
    ruby-ac25x.patch -> 1.1
    ruby-info.patch -> 1.2
    ruby.spec -> 1.24

diff --git a/ruby-ac25x.patch b/ruby-ac25x.patch
new file mode 100644 (file)
index 0000000..b22d5df
--- /dev/null
+++ b/ruby-ac25x.patch
@@ -0,0 +1,54 @@
+--- ruby-1.6.7/configure.in.orig       Wed Feb  6 10:13:15 2002
++++ ruby-1.6.7/configure.in    Wed May 22 21:44:57 2002
+@@ -264,9 +264,9 @@
+ AC_TYPE_UID_T
+ AC_TYPE_SIZE_T
+ AC_STRUCT_ST_BLKSIZE
+-save_LIBOJBS="$LIBOBJS"
++save_LOJBS="$LIB@&t@OBJS"
+ AC_STRUCT_ST_BLOCKS
+-LIBOBJS="$save_LIBOBJS"
++LIB@&t@OBJS="$save_LOBJS"
+ AC_STRUCT_ST_RDEV
+ 
+ dnl Checks for library functions.
+@@ -363,7 +363,7 @@
+   exit(0);
+ }
+ ], rb_cv_func_strtod=yes, rb_cv_func_strtod=no, rb_cv_func_strtod=no)])
+-test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
++test $rb_cv_func_strtod = no && AC_LIBOBJ([strtod])
+ 
+ AC_C_BIGENDIAN
+ AC_C_CONST
+@@ -742,7 +742,7 @@
+     if test "$rb_cv_missing_fconvert" = yes; then
+       AC_DEFINE(MISSING_FCONVERT)
+     fi
+-    LIBOBJS="$LIBOBJS x68.o"
++    AC_LIBOBJ([x68])
+     CFLAGS="$CFLAGS -fansi-only -cc1-stack=262144 -cpp-stack=2694144"
+     EXEEXT=.x
+     OBJEXT=o
+@@ -750,7 +750,7 @@
+     ;;
+   dnl OS/2 environment w/ Autoconf 2.1x for EMX
+   os2_emx)
+-    LIBOBJS="$LIBOBJS os2.$OBJEXT"
++    AC_LIBOBJ([os2])
+     setup=Setup.emx
+     ;;
+   *djgpp*)
+@@ -939,10 +939,10 @@
+       SOLIBS='$(LIBS)'
+       case "$target_os" in
+       cygwin*)
+-          LIBOBJS="$LIBOBJS strftime.o"
++          AC_LIBOBJ([strftime])
+           CCDLFLAGS=-DUSEIMPORTLIB ;;
+       mingw*)
+-          LIBOBJS="$LIBOBJS win32.o"
++          AC_LIBOBJ([win32])
+           CFLAGS="-DNT -D__MSVCRT__ $CFLAGS"
+           CCDLFLAGS=-DIMPORT ;;
+       esac

diff --git a/ruby-info.patch b/ruby-info.patch
index 123b8563a37747a36e7497f0e5e86069e2999903..18cc7373018433924e853a84b17a2ead53f6d678 100644 (file)
--- a/ruby-info.patch
+++ b/ruby-info.patch
@@ -28,3 +28,41 @@ diff -Nru ruby-1.6.2/ruby-texi-1.4-en/Ruby.texi.in ruby-1.6.2.new/ruby-texi-1.4-
  @end direntry
  
  @quotation
+--- ruby-1.6.7/ruby-texi-1.4-en/socket.texi.orig       Sun Sep 26 19:16:23 1999
++++ ruby-1.6.7/ruby-texi-1.4-en/socket.texi    Wed May 22 21:53:54 2002
+@@ -347,7 +347,7 @@
+ @code{recv} (@pxref{BasicSocket}).
+ 
+ @end defmethod
+-@defmethod @code{UDPSocket} send (@var{mesg}, @var{flags[, }@var{host}, @var{port}])
++@defmethod @code{UDPSocket} send (@var{mesg}, @var{flags}[, @var{host}, @var{port}])
+ 
+ Sends the @var{mesg} through the socket.  See
+ @samp{send(2)} for detail.  You have to specify the
+@@ -400,7 +400,7 @@
+ 
+ Receives data from the socket and returns the pair of data and the
+ path of the sender.  For arguments, see
+-@code{recv} (@pxref{}).
++@code{recv} (@pxref{BasicSocket}).
+ 
+ @end defmethod
+ @page
+@@ -524,5 +524,5 @@
+ 
+ Receives data from the socket and returns the pair of data and the
+ address of the sender.  For arguments, see
+-@code{recv} (@pxref{}).
++@code{recv} (@pxref{BasicSocket}).
+ @end defmethod
+--- ruby-1.6.7/ruby-texi-1.4-en/thread.texi.orig       Sun Sep 26 19:16:26 1999
++++ ruby-1.6.7/ruby-texi-1.4-en/thread.texi    Wed May 22 21:56:35 2002
+@@ -168,7 +168,7 @@
+ 
+ Waits for the thread to terminate and returns the evaluated value of
+ the block, which is given to the
+-@code{Thread.create} (@pxref{}).
++@code{Thread.create} (@pxref{Thread}).
+ 
+ @end defmethod
+ @defmethod @code{Thread} wakeup

diff --git a/ruby.spec b/ruby.spec
index b84cd97aeac5c1a6037ae07357cb9c4b9743752e..9f7473ad5ee866544765bb959b19b4fa1818a204 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -12,6 +12,7 @@ Source2:      http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/%{name}-uguide-981227.t
 Source3:       ftp://ftp.netlab.co.jp/pub/lang/ruby/doc/%{name}faq-990927.tar.gz
 Source4:       irb.1
 Patch0:                %{name}-info.patch
+Patch1:                %{name}-ac25x.patch
 BuildRequires: autoconf
 BuildRequires: gdbm-devel
 BuildRequires: ncurses-devel
@@ -38,6 +39,7 @@ rozszerzalny i przeno
 %prep
 %setup -q -a1 -a2 -a3
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
@@ -45,14 +47,12 @@ rozszerzalny i przeno
        --enable-shared
 %{__make}
 
+%{__make} info -C %{name}-texi-1.4-en
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1,%{_examplesdir}/%{name}-%{version}}
 
-# workaround (rather mkconfig.rb should be fixed, but I don't know ruby)
-sed -e 's/\(@ECHO_C@,\)\\c/\1\\\\c/' config.status > config.status.new
-mv -f config.status.new config.status
-
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 install sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -62,8 +62,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
 mv -f ruby-uguide guide
 mv -f rubyfaq faq
 
-gzip -9nf README README.EXT ChangeLog ToDo
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,9 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc guide faq misc *.gz
+%doc guide faq misc README README.EXT ChangeLog ToDo
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/%{name}
 %{_mandir}/*/*