- removed obsoleted patches: tmprace, notmp, DESTDIR, glibc22

- updated info patch

Changed files:
    autoconf-DESTDIR.patch -> 1.2
    autoconf-glibc22.patch -> 1.2
    autoconf-info.patch -> 1.3
    autoconf-notmp.patch -> 1.2
    autoconf-tmprace.patch -> 1.2
    autoconf.spec -> 1.48

diff --git a/autoconf-DESTDIR.patch b/autoconf-DESTDIR.patch
deleted file mode 100644 (file)
index 8a4f6c5..0000000
--- a/autoconf-DESTDIR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Nru autoconf-2.13/Makefile.in autoconf-2.13.new/Makefile.in
---- autoconf-2.13/Makefile.in  Tue Jan  5 14:27:16 1999
-+++ autoconf-2.13.new/Makefile.in      Mon Dec 13 03:36:28 1999
-@@ -137,23 +137,23 @@
-       cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
- 
- installdirs:
--      $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
-+      $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(acdatadir) $(DESTDIR)$(acdatadir)
- 
- install: all $(M4FILES) acconfig.h installdirs install-info
-       for p in $(ASCRIPTS); do \
--        $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+        $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-       done
-       for i in $(M4FROZEN); do \
--        $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-+        $(INSTALL_DATA) $$i $(DESTDIR)$(acdatadir)/$$i; \
-       done
-       for i in $(M4FILES) acconfig.h; do \
--        $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+        $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \
-       done
-       -if test -f autoscan; then \
--      $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+      $(INSTALL_PROGRAM) autoscan $(DESTDIR)$(bindir)/`echo autoscan|sed '$(transform)'`; \
-       for i in acfunctions acheaders acidentifiers acprograms \
-         acmakevars; do \
--      $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+      $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \
-       done; \
-       else :; fi
- 
-@@ -161,11 +161,11 @@
- install-info: info installdirs
-       if test -f autoconf.info; then \
-         for i in *.info*; do \
--          $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+          $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
-         done; \
-       else \
-         for i in $(srcdir)/*.info*; do \
--          $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+          $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-         done; \
-       fi
- 

diff --git a/autoconf-glibc22.patch b/autoconf-glibc22.patch
deleted file mode 100644 (file)
index 85af280..0000000
--- a/autoconf-glibc22.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- autoconf-2.13/acgeneral.m4.sux     Wed Nov 29 17:47:41 2000
-+++ autoconf-2.13/acgeneral.m4 Wed Nov 29 17:48:02 2000
-@@ -1818,7 +1818,7 @@
- [#]line __oline__ "configure"
- #include "confdefs.h"
- ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
--extern "C" void exit(int);
-+extern "C" void exit(int) throw();
- #endif
- ])dnl
- [$1]

diff --git a/autoconf-info.patch b/autoconf-info.patch
index a480480cf1e26af8ecad479ed6e79c9988a650cd..94c6921dff481d2a02bbdb93a85f2f12e161e822 100644 (file)
--- a/autoconf-info.patch
+++ b/autoconf-info.patch
@@ -1,15 +1,375 @@
-diff -Nru autoconf-2.12/autoconf.texi autoconf-2.12.new/autoconf.texi
---- autoconf-2.12/autoconf.texi        Tue Nov 26 19:09:46 1996
-+++ autoconf-2.12.new/autoconf.texi    Tue Dec 29 23:59:22 1998
-@@ -16,8 +16,10 @@
+diff -Nur autoconf-2.50.orig/doc/autoconf.texi autoconf-2.50/doc/autoconf.texi
+--- autoconf-2.50.orig/doc/autoconf.texi       Fri Jun 15 14:57:50 2001
++++ autoconf-2.50/doc/autoconf.texi    Fri Jun 15 15:21:46 2001
+@@ -27,25 +27,20 @@
+ @end ifnothtml
+ 
+ 
+-@dircategory GNU admin
++@dircategory Programming tools:
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf: (autoconf).                       Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* autoscan: (autoconf)autoscan Invocation.
+-                                Semi-automatic @file{configure.ac} writing
+-* ifnames: (autoconf)ifnames Invocation.
+-                                Listing the conditionals in source code
+-* autoconf: (autoconf)autoconf Invocation.
+-                                How to create configuration scripts
+-* autoreconf: (autoconf)autoreconf Invocation.
+-                                Remaking multiple @code{configure} scripts
+-* configure: (autoconf)configure Invocation.
+-                                Configuring a package
+-* config.status: (autoconf)config.status Invocation.
+-                                Recreating a configuration
++* autoscan: (autoconf)autoscan.               Semi-automatic @file{configure.ac} writing
++* ifnames: (autoconf)ifnames.         Listing the conditionals in source code
++* autoconf: (autoconf)autoconf.               How to create configuration scripts
++* autoreconf: (autoconf)autoreconf.   Remaking multiple @code{configure} scripts
++* configure: (autoconf)configure.     Configuring a package
++* config.status: (autoconf)config.status.
++                                      Recreating a configuration
+ @end direntry
  
  @ifinfo
- @format
-+INFO-DIR-SECTION Programming tools:
- START-INFO-DIR-ENTRY
--* Autoconf: (autoconf).         Create source code configuration scripts.
-+* autoconf: (autoconf).                       Create source code 
-+                                      configuration scripts
- END-INFO-DIR-ENTRY
- @end format
+@@ -142,7 +137,7 @@
+ * Manual Configuration::        Selecting features that can't be guessed
+ * Site Configuration::          Local defaults for @code{configure}
+ * Running configure scripts::   How to use the Autoconf output
+-* config.status Invocation::    Recreating a configuration
++* config.status::               Recreating a configuration
+ * Obsolete Constructs::         Kept for backward compatibility
+ * Questions::                   Questions about Autoconf, with answers
+ * History::                     History of Autoconf
+@@ -164,10 +159,10 @@
+ Making @code{configure} Scripts
+ 
+ * Writing configure.ac::        What to put in an Autoconf input file
+-* autoscan Invocation::         Semi-automatic @file{configure.ac} writing
+-* ifnames Invocation::          Listing the conditionals in source code
+-* autoconf Invocation::         How to create configuration scripts
+-* autoreconf Invocation::       Remaking multiple @code{configure} scripts
++* autoscan::                    Semi-automatic @file{configure.ac} writing
++* ifnames::                     Listing the conditionals in source code
++* autoconf::                    How to create configuration scripts
++* autoreconf::                  Remaking multiple @code{configure} scripts
+ 
+ Writing @file{configure.ac}
+ 
+@@ -199,7 +194,7 @@
+ Configuration Header Files
+ 
+ * Header Templates::            Input for the configuration headers
+-* autoheader Invocation::       How to create configuration templates
++* autoheader::                  How to create configuration templates
+ * Autoheader Macros::           How to specify CPP templates
+ 
+ Existing Tests
+@@ -348,13 +343,13 @@
+ * System Type::                 Specifying the system type
+ * Sharing Defaults::            Setting site-wide defaults for @code{configure}
+ * Environment Variables::       Defining environment variables.
+-* configure Invocation::        Changing how @code{configure} runs
++* configure::                   Changing how @code{configure} runs
+ 
+ Obsolete Constructs
+ 
+ * Obsolete config.status Use::  Different calling convention
+ * acconfig.h::                  Additional entries in @file{config.h.in}
+-* autoupdate Invocation::       Automatic update of @file{configure.ac}
++* autoupdate::                  Automatic update of @file{configure.ac}
+ * Obsolete Macros::             Backward compatibility macros
+ * Autoconf 1::                  Tips for upgrading your files
+ 
+@@ -652,7 +647,7 @@
+ 
+ @item
+ a shell script called @file{config.status} that, when run, will recreate
+-the files listed above (@pxref{config.status Invocation});
++the files listed above (@pxref{config.status});
+ 
+ @item
+ an optional shell script normally called @file{config.cache}
+@@ -712,13 +707,13 @@
+ 
+ @menu
+ * Writing configure.ac::        What to put in an Autoconf input file
+-* autoscan Invocation::         Semi-automatic @file{configure.ac} writing
+-* ifnames Invocation::          Listing the conditionals in source code
+-* autoconf Invocation::         How to create configuration scripts
+-* autoreconf Invocation::       Remaking multiple @code{configure} scripts
++* autoscan::                    Semi-automatic @file{configure.ac} writing
++* ifnames::                     Listing the conditionals in source code
++* autoconf::                    How to create configuration scripts
++* autoreconf::                  Remaking multiple @code{configure} scripts
+ @end menu
+ 
+-@node Writing configure.ac, autoscan Invocation, Making configure Scripts, Making configure Scripts
++@node Writing configure.ac, autoscan, Making configure Scripts, Making configure Scripts
+ @section Writing @file{configure.ac}
+ 
+ To produce a @code{configure} script for a software package, create a
+@@ -730,7 +725,7 @@
+ @ref{Writing Tests}, for information about them.  For especially tricky
+ or specialized features, @file{configure.ac} might need to contain some
+ hand-crafted shell commands.  The @code{autoscan} program can give you a
+-good start in writing @file{configure.ac} (@pxref{autoscan Invocation},
++good start in writing @file{configure.ac} (@pxref{autoscan},
+ for more information).
+ 
+ Previous versions of Autoconf promoted the name @file{configure.in},
+@@ -959,7 +954,7 @@
+ @end display
+ 
+ 
+-@node autoscan Invocation, ifnames Invocation, Writing configure.ac, Making configure Scripts
++@node autoscan, ifnames, Writing configure.ac, Making configure Scripts
+ @section Using @code{autoscan} to Create @file{configure.ac}
+ @cindex @code{autoscan}
+ 
+@@ -979,7 +974,7 @@
+ configuration header file, you must add a call to
+ @code{AC_CONFIG_HEADERS} (@pxref{Configuration Headers}).  You might also
+ have to change or add some @code{#if} directives to your program in
+-order to make it work with Autoconf (@pxref{ifnames Invocation}, for
++order to make it work with Autoconf (@pxref{ifnames}, for
+ information about a program that can help with that job).
+ 
+ @code{autoscan} uses several data files (installed along with Autoconf)
+@@ -1017,7 +1012,7 @@
+ plays with different versions of Autoconf simultaneously.
+ @end table
+ 
+-@node ifnames Invocation, autoconf Invocation, autoscan Invocation, Making configure Scripts
++@node ifnames, autoconf, autoscan, Making configure Scripts
+ @section Using @code{ifnames} to List Conditionals
+ @cindex @code{ifnames}
+ 
+@@ -1026,8 +1021,7 @@
+ preprocessor conditionals.  If a package has already been set up to have
+ some portability, @code{ifnames} can thus help you figure out what its
+ @code{configure} needs to check for.  It may help fill in some gaps in a
+-@file{configure.ac} generated by @code{autoscan} (@pxref{autoscan
+-Invocation}).
++@file{configure.ac} generated by @code{autoscan} (@pxref{autoscan}).
+ 
+ @code{ifnames} scans all of the C source files named on the command line
+ (or the standard input, if none are given) and writes to the standard
+@@ -1049,7 +1043,7 @@
+ Print the version number of Autoconf and exit.
+ @end table
+ 
+-@node autoconf Invocation, autoreconf Invocation, ifnames Invocation, Making configure Scripts
++@node autoconf, autoreconf, ifnames, Making configure Scripts
+ @section Using @code{autoconf} to Create @code{configure}
+ @cindex @code{autoconf}
+ 
+@@ -1311,7 +1305,7 @@
+ @end group
+ @end example
+ 
+-@node autoreconf Invocation,  , autoconf Invocation, Making configure Scripts
++@node autoreconf,  , autoconf, Making configure Scripts
+ @section Using @code{autoreconf} to Update @code{configure} Scripts
+ @cindex @code{autoreconf}
+ 
+@@ -1533,8 +1527,8 @@
+ source directory; @code{configure} checks for this file's existence to
+ make sure that the directory that it is told contains the source code in
+ fact does.  Occasionally people accidentally specify the wrong directory
+-with @option{--srcdir}; this is a safety check.  @xref{configure
+-Invocation}, for more information.
++with @option{--srcdir}; this is a safety check.  @xref{configure},
++for more information.
+ @end defmac
+ 
+ 
+@@ -1719,7 +1713,7 @@
+ when used in @var{output}, or the standard input when used in the
+ @var{inputs}.  You most probably don't need to use this in
+ @file{configure.ac}, but it is convenient when using the command line
+-interface of @file{./config.status}, see @ref{config.status Invocation},
++interface of @file{./config.status}, see @ref{config.status},
+ for more details.
+ 
+ The @var{inputs} may be absolute or relative filenames.  In the latter
+@@ -2185,7 +2179,7 @@
+ @file{config.h} is considered up to date.  @xref{Output}, for more
+ information about @code{AC_OUTPUT}.
+ 
+-@xref{config.status Invocation}, for more examples of handling
++@xref{config.status}, for more examples of handling
+ configuration-related dependencies.
+ 
+ @node Configuration Headers, Configuration Commands, Makefile Substitutions, Setup
+@@ -2246,11 +2240,11 @@
+ 
+ @menu
+ * Header Templates::            Input for the configuration headers
+-* autoheader Invocation::       How to create configuration templates
++* autoheader::                  How to create configuration templates
+ * Autoheader Macros::           How to specify CPP templates
+ @end menu
+ 
+-@node Header Templates, autoheader Invocation, Configuration Headers, Configuration Headers
++@node Header Templates, autoheader, Configuration Headers, Configuration Headers
+ @subsection Configuration Header Templates
+ @cindex Configuration Header Template
+ @cindex @file{config.h.in}
+@@ -2297,10 +2291,10 @@
+ @samp{#undef} is strongly discouraged.
+ 
+ Since it is a tedious task to keep a template header up to date, you may
+-use @code{autoheader} to generate it, see @ref{autoheader Invocation}.
++use @code{autoheader} to generate it, see @ref{autoheader}.
+ 
+ 
+-@node autoheader Invocation, Autoheader Macros, Header Templates, Configuration Headers
++@node autoheader, Autoheader Macros, Header Templates, Configuration Headers
+ @subsection Using @code{autoheader} to Create @file{config.h.in}
+ @cindex @code{autoheader}
+ 
+@@ -2405,7 +2399,7 @@
+ 
+ 
+ 
+-@node Autoheader Macros,  , autoheader Invocation, Configuration Headers
++@node Autoheader Macros,  , autoheader, Configuration Headers
+ @subsection Autoheader Macros
+ 
+ @code{autoheader} scans @file{configure.ac} and figures out which C
+@@ -7854,7 +7848,7 @@
+ 
+ When the user runs @samp{autoconf -W error}, warnings from
+ @code{AC_DIAGNOSE} and @code{AC_WARNING} are reported as error, see
+-@ref{autoconf Invocation}.
++@ref{autoconf}.
+ 
+ @node Dependencies Between Macros, Obsoleting Macros, Reporting Messages, Writing Macros
+ @section Dependencies Between Macros
+@@ -8892,7 +8886,7 @@
+ 
+ @c ============================================== Running configure Scripts.
+ 
+-@node Running configure scripts, config.status Invocation, Site Configuration, Top
++@node Running configure scripts, config.status, Site Configuration, Top
+ @chapter Running @code{configure} Scripts
+ @cindex @code{configure}
+ 
+@@ -8910,7 +8904,7 @@
+ * System Type::                 Specifying the system type
+ * Sharing Defaults::            Setting site-wide defaults for @code{configure}
+ * Environment Variables::       Defining environment variables.
+-* configure Invocation::        Changing how @code{configure} runs
++* configure::                   Changing how @code{configure} runs
+ @end menu
+ 
+ @include install.texi
+@@ -8918,7 +8912,7 @@
+ 
+ @c ============================================== Recreating a Configuration
+ 
+-@node config.status Invocation, Obsolete Constructs, Running configure scripts, Top
++@node config.status, Obsolete Constructs, Running configure scripts, Top
+ @chapter Recreating a Configuration
+ @cindex @code{config.status}
+ 
+@@ -9037,7 +9031,7 @@
+ 
+ @c =================================================== Obsolete Constructs
+ 
+-@node Obsolete Constructs, Questions, config.status Invocation, Top
++@node Obsolete Constructs, Questions, config.status, Top
+ @chapter Obsolete Constructs
+ 
+ Autoconf changes, and throughout the years some constructs are obsoleted.
+@@ -9051,7 +9045,7 @@
+ @menu
+ * Obsolete config.status Use::  Different calling convention
+ * acconfig.h::                  Additional entries in @file{config.h.in}
+-* autoupdate Invocation::       Automatic update of @file{configure.ac}
++* autoupdate::                  Automatic update of @file{configure.ac}
+ * Obsolete Macros::             Backward compatibility macros
+ * Autoconf 1::                  Tips for upgrading your files
+ @end menu
+@@ -9060,7 +9054,7 @@
+ @section Obsolete @file{config.status} Invocation
+ 
+ @file{config.status} now supports arguments to specify the files to
+-instantiate, see @ref{config.status Invocation}, for more details.
++instantiate, see @ref{config.status}, for more details.
+ Before, environment variables had to be used.
+ 
+ @defvar CONFIG_COMMANDS
+@@ -9091,7 +9085,7 @@
+ @file{config.status} ignores this variable.
+ @end defvar
+ 
+-In @ref{config.status Invocation}, using this old interface, the example
++In @ref{config.status}, using this old interface, the example
+ would be:
+ 
+ @example
+@@ -9114,7 +9108,7 @@
+ for @code{CONFIG_COMMANDS} etc.)
+ 
+ 
+-@node acconfig.h, autoupdate Invocation, Obsolete config.status Use, Obsolete Constructs
++@node acconfig.h, autoupdate, Obsolete config.status Use, Obsolete Constructs
+ @section @file{acconfig.h}
+ 
+ @cindex @file{acconfig.h}
+@@ -9165,7 +9159,7 @@
+ self-contained, and should not depend upon @file{acconfig.h} etc.
+ 
+ 
+-@node autoupdate Invocation, Obsolete Macros, acconfig.h, Obsolete Constructs
++@node autoupdate, Obsolete Macros, acconfig.h, Obsolete Constructs
+ @section Using @code{autoupdate} to Modernize @file{configure.ac}
+ @cindex @code{autoupdate}
+ 
+@@ -9223,7 +9217,7 @@
+ instead of in the current directory.
+ @end table
+ 
+-@node Obsolete Macros, Autoconf 1, autoupdate Invocation, Obsolete Constructs
++@node Obsolete Macros, Autoconf 1, autoupdate, Obsolete Constructs
+ @section Obsolete Macros
+ 
+ Several macros are obsoleted in Autoconf, for various reasons (typically
+@@ -9987,7 +9981,7 @@
+ 
+ If you have an @file{aclocal.m4} installed with Autoconf (as opposed to
+ in a particular package's source directory), you must rename it to
+-@file{acsite.m4}.  @xref{autoconf Invocation}.
++@file{acsite.m4}.  @xref{autoconf}.
+ 
+ If you distribute @file{install.sh} with your package, rename it to
+ @file{install-sh} so @code{make} builtin rules won't inadvertently
+@@ -10042,7 +10036,7 @@
+ the documentation for them.  @xref{Obsolete Macros}, for a table showing the
+ new names for the old macros.  Use the @code{autoupdate} program to
+ convert your @file{configure.ac} to using the new macro names.
+-@xref{autoupdate Invocation}.
++@xref{autoupdate}.
+ 
+ Some macros have been superseded by similar ones that do the job better,
+ but are not call-compatible.  If you get warnings about calling obsolete
+diff -Nur autoconf-2.50.orig/doc/install.texi autoconf-2.50/doc/install.texi
+--- autoconf-2.50.orig/doc/install.texi        Mon Mar 19 15:28:42 2001
++++ autoconf-2.50/doc/install.texi     Fri Jun 15 15:26:39 2001
+@@ -215,8 +215,8 @@
+ overridden in the site shell script).
+ 
+ 
+-@node configure Invocation
+-@section @code{configure} Invocation
++@node configure
++@section @code{configure}
  
+ @code{configure} recognizes the following options to control how it
+ operates.

diff --git a/autoconf-notmp.patch b/autoconf-notmp.patch
deleted file mode 100644 (file)
index eea5c24..0000000
--- a/autoconf-notmp.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- autoconf-2.13/autoconf.sh~ Fri Mar 26 20:50:48 1999
-+++ autoconf-2.13/autoconf.sh  Fri Mar 26 20:58:22 1999
-@@ -52,13 +52,13 @@
- while test $# -gt 0 ; do
-    case "${1}" in
-       -h | --help | --h* )
--         echo "${usage}" 1>&2; exit 0 ;;
-+         echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;;
-       --localdir=* | --l*=* )
-          localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
-          shift ;;
-       -l | --localdir | --l*)
-          shift
--         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-+         test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; }
-          localdir="${1}"
-          shift ;;
-       --macrodir=* | --m*=* )
-@@ -66,7 +66,7 @@
-          shift ;;
-       -m | --macrodir | --m* )
-          shift
--         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-+         test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; }
-          AC_MACRODIR="${1}"
-          shift ;;
-       --version | --v* )
-@@ -76,7 +76,7 @@
-       - )     # Use stdin as input.
-         break ;;
-       -* )
--        echo "${usage}" 1>&2; exit 1 ;;
-+        echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;;
-       * )
-         break ;;
-    esac
-@@ -86,13 +86,14 @@
-   version=`sed -n 's/define.AC_ACVERSION.[    ]*\([0-9.]*\).*/\1/p' \
-     $AC_MACRODIR/acgeneral.m4`
-   echo "Autoconf version $version"
-+  rm -f $tmpout
-   exit 0
- fi
- 
- case $# in
-   0) infile=configure.in ;;
-   1) infile="$1" ;;
--  *) echo "$usage" >&2; exit 1 ;;
-+  *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;;
- esac
- 
- trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
-@@ -103,6 +104,7 @@
-   infile=$tmpin
- elif test ! -r "$infile"; then
-   echo "autoconf: ${infile}: No such file or directory" >&2
-+  rm -f $tmpin $tmpout
-   exit 1
- fi
- 
-@@ -111,6 +113,8 @@
- else
-   use_localdir=
- fi
-+# Make sure we don't leave those around - they are annoying
-+trap 'rm -f $tmpin $tmpout' 0
- 
- # Use the frozen version of Autoconf if available.
- r= f=
-@@ -118,7 +122,7 @@
- case `$M4 --help < /dev/null 2>&1` in
- *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
- *traditional*) ;;
--*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
-+*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;;
- esac
- 
- $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
-@@ -154,6 +158,6 @@
- /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
- ' >&4
- 
--rm -f $tmpout
-+rm -f $tmpout $tmpin
- 
- exit $status
---- autoconf-2.13/autoupdate.sh~       Fri Mar 26 20:50:48 1999
-+++ autoconf-2.13/autoupdate.sh        Fri Mar 26 21:02:18 1999
-@@ -35,13 +35,13 @@
- while test $# -gt 0 ; do
-    case "${1}" in 
-       -h | --help | --h* )
--         echo "${usage}" 1>&2; exit 0 ;;
-+         echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;;
-       --macrodir=* | --m*=* )
-          AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
-          shift ;;
-       -m | --macrodir | --m* ) 
-          shift
--         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-+         test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; }
-          AC_MACRODIR="${1}"
-          shift ;;
-       --version | --versio | --versi | --vers)
-@@ -51,7 +51,7 @@
-       - )     # Use stdin as input.
-         break ;;
-       -* )
--        echo "${usage}" 1>&2; exit 1 ;;
-+        echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;;
-       * )
-         break ;;
-    esac
-@@ -61,6 +61,7 @@
-   version=`sed -n 's/define.AC_ACVERSION.[    ]*\([0-9.]*\).*/\1/p' \
-     $AC_MACRODIR/acgeneral.m4`
-   echo "Autoconf version $version"
-+  rm -f $sedtmp
-   exit 0
- fi
- 
-@@ -68,6 +69,7 @@
- 
- tmpout=acupo.$$
- trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
-+trap 'rm -f $sedtmp' 0
- case $# in
-   0) infile=configure.in; out="> $tmpout"
-      # Make sure $infile can be read, and $tmpout has the same permissions.

diff --git a/autoconf-tmprace.patch b/autoconf-tmprace.patch
deleted file mode 100644 (file)
index 0d1a9dc..0000000
--- a/autoconf-tmprace.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- autoconf-2.12/autoconf.sh.race     Thu Aug 27 19:01:23 1998
-+++ autoconf-2.12/autoconf.sh  Thu Aug 27 19:05:04 1998
-@@ -45,7 +45,7 @@
- esac
- 
- : ${TMPDIR=/tmp}
--tmpout=${TMPDIR}/acout.$$
-+tmpout=`/bin/mktemp ${TMPDIR}/acout.XXXXXX`
- localdir=
- show_version=no
- 
-@@ -97,10 +97,10 @@
- 
- trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
- 
--tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
-+tmpin=`/bin/mktemp ${TMPDIR}/acin.XXXXXX`
-+# Always set this, to avoid bogus errors from some rm's.
- if test z$infile = z-; then
-   infile=$tmpin
--  cat > $infile
- elif test ! -r "$infile"; then
-   echo "autoconf: ${infile}: No such file or directory" >&2
-   exit 1
---- autoconf-2.12/autoheader.sh.race   Thu Aug 27 19:05:19 1998
-+++ autoconf-2.12/autoheader.sh        Thu Aug 27 19:08:18 1998
-@@ -194,9 +194,9 @@
-   # Some fgrep's have limits on the number of lines that can be in the
-   # pattern on the command line, so use a temporary file containing the
-   # pattern.
--  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
-+  (fgrep_tmp=`/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX`
-    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
--   cat > $fgrep_tmp <<EOF
-+   cat >> $fgrep_tmp <<EOF
- $syms
- EOF
-    fgrep -f $fgrep_tmp
---- autoconf-2.12/autoupdate.sh.race   Thu Aug 27 19:09:12 1998
-+++ autoconf-2.12/autoupdate.sh        Thu Aug 27 19:10:05 1998
-@@ -26,7 +26,7 @@
- Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
-        [--version] [template-file]" 
- 
--sedtmp=/tmp/acups.$$
-+sedtmp=`/bin/mktemp /tmp/acups.XXXXXX`
- # For debugging.
- #sedtmp=/tmp/acups
- show_version=no

diff --git a/autoconf.spec b/autoconf.spec
index 507e97bfa324bd11948b6e0638df7a6aa79f9aa9..f1d3bd35f7ddffc2129bbbc35e7f1d4e8c767e94 100644 (file)
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -11,16 +11,12 @@ License:    GPL
 Group:         Development/Building
 Group(pl):     Programowanie/Budowanie
 Source0:       ftp://ftp.gnu.org/pub/gnu/autoconf/%{name}-%{version}.tar.gz
-#Patch0:               %{name}-tmprace.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-mawk.patch
-Patch3:                %{name}-man.patch
-#Patch4:               %{name}-notmp.patch
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-mawk.patch
+Patch2:                %{name}-man.patch
+Patch3:                %{name}-fhs.patch
+Patch4:                %{name}-version.patch
 #Patch5:               %{name}-pinard.patch
-Patch6:                %{name}-fhs.patch
-#Patch7:               %{name}-DESTDIR.patch
-#Patch8:               %{name}-glibc22.patch
-Patch9:                %{name}-version.patch
 URL:           http://sourceware.cygnus.com/autoconf/
 Requires:      /bin/awk
 Requires:      m4
@@ -132,16 +128,12 @@ tylko podczas generowania samych skrypt
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p1
 #%patch5 -p1
-%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
-%patch9 -p1
 
 %build
 %configure2_50