- updated to 4.3, updated info patch

- removed obsolete fileextension,ALL_LINGUAS,ac_fixes,am_fixes patches
- zlib patch not updated - shouldn't it go to /dev/null?

Changed files:
    texinfo-ALL_LINGUAS.patch -> 1.3
    texinfo-ac_fixes.patch -> 1.2
    texinfo-am_fixes.patch -> 1.2
    texinfo-fileextension.patch -> 1.2
    texinfo.spec -> 1.74

diff --git a/texinfo-ALL_LINGUAS.patch b/texinfo-ALL_LINGUAS.patch
deleted file mode 100644 (file)
index 4159074..0000000
--- a/texinfo-ALL_LINGUAS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur texinfo-4.1-/configure.ac texinfo-4.1/configure.ac
---- texinfo-4.1-/configure.ac  Mon Mar  4 16:54:57 2002
-+++ texinfo-4.1/configure.ac   Sat Mar  9 16:04:07 2002
-@@ -107,6 +107,7 @@
- AC_SUBST(TERMLIBS)
- 
- dnl i18n support.
-+ALL_LINGUAS="cs da de_AT de eo fr he hr ja nl no ru sv"
- AM_GNU_GETTEXT()
- 
- AC_CONFIG_FILES([Makefile          \

diff --git a/texinfo-ac_fixes.patch b/texinfo-ac_fixes.patch
deleted file mode 100644 (file)
index 051a3f0..0000000
--- a/texinfo-ac_fixes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- texinfo-4.2/configure.ac~  Tue May  7 06:49:03 2002
-+++ texinfo-4.2/configure.ac   Tue May  7 06:49:03 2002
-@@ -3,11 +3,10 @@
- dnl
- AC_PREREQ(2.52)dnl Minimum Autoconf version required.
- dnl
--AC_INIT([GNU Texinfo], [4.2])
-+AC_INIT([src/defun.h])
-+AM_INIT_AUTOMAKE(texinfo, 4.2)
- AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
--AM_CONFIG_HEADER(config.h:config.in)dnl Keep filename to 8.3 for MS-DOS.
--AM_INIT_AUTOMAKE
--dnl
-+AM_CONFIG_HEADER(config.h:config.in)
- AM_CONDITIONAL(TEXINFO_MAINT, test -n "$TEXINFO_MAINT")
- 
- dnl Checks for programs.
-@@ -20,7 +19,7 @@
- AC_MINIX
- 
- # Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
--AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock))
-+AC_CHECK_FUNC(sigblock, [], AC_CHECK_LIB(bsd, sigblock))
- 
- dnl Checks for header files.
- dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
-@@ -119,7 +119,7 @@
- 
- dnl i18n support.
- ALL_LINGUAS="cs da de_AT de eo fr he hr ja nl no ru sv"
--AM_GNU_GETTEXT()
-+AM_GNU_GETTEXT
- 
- AC_CONFIG_FILES([Makefile          \
-            doc/Makefile            \
---- texinfo-4.2/acinclude.m4~  Tue May  7 07:05:14 2002
-+++ texinfo-4.2/acinclude.m4   Tue May  7 07:05:14 2002
-@@ -3,7 +3,7 @@
- 
- #serial 3
- 
--AC_DEFUN(jm_CHECK_DECLARATION,
-+AC_DEFUN([jm_CHECK_DECLARATION],
- [
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h)
-@@ -34,7 +34,7 @@
- 
- dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
- dnl                       [, ACTION-IF-NOT-DECLARED]])
--AC_DEFUN(jm_CHECK_DECLARATIONS,
-+AC_DEFUN([jm_CHECK_DECLARATIONS],
- [
-   for jm_func in $2
-   do
-@@ -52,7 +52,7 @@
- dnl This is just a wrapper function to encapsulate this kludge.
- dnl Putting it in a separate file like this helps share it between
- dnl different packages.
--AC_DEFUN(txi_CHECK_DECLS,
-+AC_DEFUN([txi_CHECK_DECLS],
- [
-   headers='
- #include <stdio.h>

diff --git a/texinfo-am_fixes.patch b/texinfo-am_fixes.patch
deleted file mode 100644 (file)
index 87e227b..0000000
--- a/texinfo-am_fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- texinfo-4.2/info/Makefile.am~      Tue May  7 07:18:17 2002
-+++ texinfo-4.2/info/Makefile.am       Tue May  7 07:18:17 2002
-@@ -25,7 +25,7 @@
- # we need to override it, so include them ourselves.
- INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
- DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
--LDADD = ../lib/libtxi.a @TERMLIBS@ @LIBINTL@
-+LDADD = ../lib/libtxi.a $(TERMLIBS) $(INTLLIBS)
- 
- EXTRA_DIST = README pcterm.c
- 
---- texinfo-4.2/util/Makefile.am~      Tue May  7 07:20:07 2002
-+++ texinfo-4.2/util/Makefile.am       Tue May  7 07:20:07 2002
-@@ -15,7 +15,7 @@
- 
- localedir = $(datadir)/locale
- INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ../lib/libtxi.a @LIBINTL@ -lz
-+LDADD = ../lib/libtxi.a $(INTLLIBS) -lz
- 
- # Most of these are for fun.  The only one that's really supported is texi2dvi.
- EXTRA_DIST = README deref.c fix-info-dir fixfonts \
---- texinfo-4.2/makeinfo/Makefile.am~  Tue May  7 07:20:45 2002
-+++ texinfo-4.2/makeinfo/Makefile.am   Tue May  7 07:20:45 2002
-@@ -14,7 +14,7 @@
- 
- localedir = $(datadir)/locale
- INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ../lib/libtxi.a @LIBINTL@
-+LDADD = ../lib/libtxi.a $(INTLLIBS)
- 
- makeinfo_SOURCES = \
-   cmds.c cmds.h defun.c defun.h docbook.c docbook.h \

diff --git a/texinfo-fileextension.patch b/texinfo-fileextension.patch
deleted file mode 100644 (file)
index 00ce32f..0000000
--- a/texinfo-fileextension.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- texinfo-4.0/util/texi2dvi.20498    Wed Nov  8 09:59:26 2000
-+++ texinfo-4.0/util/texi2dvi  Wed Nov  8 09:59:56 2000
-@@ -470,7 +470,7 @@
-     # before .aux and .?o?.
-     index_files=`echo "$orig_xref_files" \
-                  | sed "s!.*\.aux!!g;
--                        s!./$filename_noext\..o.!!g;
-+                        s!./$filename_noext\..o[^ ]!!g;
-                         s/^[ ]*//;s/[ ]*$//"`
-     # Run texindex (or makeindex) on current index files.  If they
-     # already exist, and after running TeX a first time the index

diff --git a/texinfo.spec b/texinfo.spec
index 6525a55a324559714aa5f01f6527d4a5ef26936b..d1604e8db284c902e9e0a550c9cdeb70b4f5b02c 100644 (file)
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -8,19 +8,15 @@ Summary(ru):  
 Summary(tr):   texinfo biçimleyici ve info okuyucu
 Summary(uk):   ¶ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÆÁÊÌ¦× ÄÏËÕÍÅÎÔÁæ§ ÆÏÒÍÁÔÕ Texinfo
 Name:          texinfo
-Version:       4.2
-Release:       5
+Version:       4.3
+Release:       1
 License:       GPL
 Group:         Applications/Publishing
-Source0:       ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Source1:       info.desktop
 Patch0:                %{name}-fix.patch
 Patch1:                %{name}-zlib.patch
 Patch2:                %{name}-info.patch
-Patch3:                %{name}-fileextension.patch
-Patch4:                %{name}-ALL_LINGUAS.patch
-Patch5:                %{name}-ac_fixes.patch
-Patch6:                %{name}-am_fixes.patch
 URL:           http://texinfo.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -180,12 +176,8 @@ Narz
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 rm -f missing m4/{codeset,gettext,glibc21,iconv,isc-posix,lcmessage,progtest}.m4