rpms/texinfo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to texinfo-5.0

Browse Source
This commit is contained in:
Vitezslav Crhonek 2013-02-19 15:18:39 +01:00
parent 12d4440b34
commit e576f6917d
11 changed files with 91 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
texinfo-4.13a.tar.lzma
texinfo-4.13a.tar.lzma.sig
/texinfo-5.0.tar.xz
/texinfo-5.0.tar.xz.sig

4
sources
View File

@ -1,2 +1,2 @@
20b37e49464bd72df4c6cfba33340f87 texinfo-4.13a.tar.lzma
40486b49736e745e49281a78728e943a texinfo-4.13a.tar.lzma.sig
ef2fad34c71ddc95b20c7d6a08c0d7a6 texinfo-5.0.tar.xz
a1e46e27d14467b05abe652bfc30684e texinfo-5.0.tar.xz.sig

49
texi2pdf.man
View File

@ -1,49 +0,0 @@
.TH "texi2pdf" "1" "September 2000" "teTeX" "teTeX"
.PP
.SH "NAME"
texi2pdf \- create a PDF file from a Texinfo file
.PP
.SH "SYNOPSIS"
.PP
\fBtexi2pdf\fP [ \fIOPTION\fP\&.\&.\&. ] \fIFILE\fP\&.\&.\&.
.PP
.SH "DESCRIPTION"
.PP
\fBtexi2pdf\fP sets the \fBTEX\fP environment variable to
\fBpdftex\fP(1) and runs \fBtexi2dvi\fP(1), passing all options to
\fBtexi2dvi\fP(1)\&.
.PP
.SH "OPTIONS"
.PP
See \fBtexi2dvi\fP(1) for relevant options\&.
.PP
.SH "ENVIRONMENT"
.PP
.IP
.IP "\fBTEX\fP"
set to \fBpdftex\fP(1) by the script
.IP
.PP
.SH "SEE ALSO"
.PP
\fBpdftex\fP(1), \fBtexi2dvi\fP(1), \fBtexinfo\fP(5)\&.
.PP
.SH "BUGS"
.PP
Problems with this script should be reported to the author or to the
teTeX list, <tetex@dbs\&.uni-hannover\&.de> (mailing list)\&.
.PP
Problems with \fBtexi2dvi\fP(1) should be reported to Karl Berry,
the texinfo maintainer, at <bug-texinfo@gnu\&.org> (mailing list)
.PP
.SH "AUTHOR"
.PP
Written by Thomas Esser
<te@dbs\&.uni-hannover\&.de>\&.
.PP
This manual page was written by C\&.M\&. Connelly
<c@eskimo\&.com>, for
the Debian GNU/Linux system\&. It may be used by other distributions
without contacting the author\&. Any mistakes or omissions in the
manual page are my fault; inquiries about or corrections to this
manual page should be directed to me (and not to the primary author)\&.

115
texinfo-4.12-zlib.patch
View File

@ -1,19 +1,7 @@
diff -up texinfo-4.12/install-info/Makefile.in_old texinfo-4.12/install-info/Makefile.in
--- texinfo-4.12/install-info/Makefile.in_old 2008-05-13 13:33:55.000000000 +0200
+++ texinfo-4.12/install-info/Makefile.in 2008-05-13 13:52:35.000000000 +0200
@@ -114,7 +114,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c
--- texinfo-4.12/install-info/install-info.c_old 2008-05-13 13:52:44.000000000 +0200
+++ texinfo-4.12/install-info/install-info.c 2008-05-14 10:30:53.000000000 +0200
@@ -21,6 +21,7 @@
diff -up texinfo-5.0/install-info/install-info.c.orig texinfo-5.0/install-info/install-info.c
--- texinfo-5.0/install-info/install-info.c.orig 2013-01-07 00:18:56.000000000 +0100
+++ texinfo-5.0/install-info/install-info.c 2013-02-18 16:36:37.016947532 +0100
@@ -22,6 +22,7 @@
#include <getopt.h>
#include <regex.h>
#include <argz.h>
@ -21,16 +9,16 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
#define TAB_WIDTH 8
@@ -638,7 +639,7 @@ The first time you invoke Info you start
COMPRESSION_PROGRAM. The compression program is determined by the
magic number, not the filename. */
@@ -665,7 +666,7 @@ The first time you invoke Info you start
MAGIC number, not the filename. */
-FILE *
+void *
open_possibly_compressed_file (char *filename,
void (*create_callback) (char *),
char **opened_filename, char **compression_program, int *is_pipe)
@@ -646,7 +647,7 @@ open_possibly_compressed_file (char *fil
@@ -673,7 +674,7 @@ open_possibly_compressed_file (char *fil
char *local_opened_filename, *local_compression_program;
int nread;
char data[13];
@ -39,7 +27,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
/* We let them pass NULL if they don't want this info, but it's easier
to always determine it. */
@@ -654,22 +655,22 @@ open_possibly_compressed_file (char *fil
@@ -681,42 +682,42 @@ open_possibly_compressed_file (char *fil
opened_filename = &local_opened_filename;
*opened_filename = filename;
@ -50,6 +38,14 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
*opened_filename = concat (filename, ".gz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".xz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
@ -64,34 +60,33 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#ifdef __MSDOS__
@@ -677,13 +678,13 @@ open_possibly_compressed_file (char *fil
{
free (*opened_filename);
*opened_filename = concat (filename, ".igz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".inz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#endif
if (!f)
@@ -695,7 +696,7 @@ open_possibly_compressed_file (char *fil
/* And try opening it again. */
free (*opened_filename);
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
if (!f)
pfatal_with_name (filename);
}
@@ -706,12 +707,12 @@ open_possibly_compressed_file (char *fil
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".igz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".inz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#endif /* __MSDOS__ */
if (!f)
@@ -728,7 +729,7 @@ open_possibly_compressed_file (char *fil
/* And try opening it again. */
free (*opened_filename);
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
if (!f)
pfatal_with_name (filename);
}
@@ -738,12 +739,12 @@ open_possibly_compressed_file (char *fil
/* Read first few bytes of file rather than relying on the filename.
If the file is shorter than this it can't be usable anyway. */
@ -104,10 +99,10 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
"install-info: No error for foo", which is confusing. */
- if (nread == 0)
+ if (nread >= 0)
fatal (_("%s: empty file"), *opened_filename, 0);
fatal (_("%s: empty file"), *opened_filename);
pfatal_with_name (*opened_filename);
}
@@ -758,20 +759,22 @@ open_possibly_compressed_file (char *fil
@@ -802,20 +803,22 @@ open_possibly_compressed_file (char *fil
if (*compression_program)
{ /* It's compressed, so fclose the file and then open a pipe. */
@ -135,7 +130,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
/* Since this is a text file, and we opened it in binary mode,
switch back to text mode. */
f = freopen (*opened_filename, "r", f);
@@ -796,7 +799,7 @@ readfile (char *filename, int *sizep,
@@ -840,7 +843,7 @@ readfile (char *filename, int *sizep,
char **compression_program)
{
char *real_name;
@ -144,13 +139,13 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
int pipe_p;
int filled = 0;
int data_size = 8192;
@@ -810,7 +813,12 @@ readfile (char *filename, int *sizep,
@@ -854,7 +857,12 @@ readfile (char *filename, int *sizep,
for (;;)
{
- int nread = fread (data + filled, 1, data_size - filled, f);
+ int nread;
+
+
+ if (pipe_p)
+ nread = fread (data + filled, 1, data_size - filled, f);
+ else
@ -158,7 +153,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
if (nread < 0)
pfatal_with_name (real_name);
if (nread == 0)
@@ -832,7 +840,7 @@ readfile (char *filename, int *sizep,
@@ -876,7 +884,7 @@ readfile (char *filename, int *sizep,
if (pipe_p)
pclose (f);
else
@ -167,3 +162,15 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
*sizep = filled;
return data;
diff -up texinfo-5.0/install-info/Makefile.in.orig texinfo-5.0/install-info/Makefile.in
--- texinfo-5.0/install-info/Makefile.in.orig 2013-02-16 18:23:16.000000000 +0100
+++ texinfo-5.0/install-info/Makefile.in 2013-02-18 16:36:09.633794780 +0100
@@ -168,7 +168,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1)

32
texinfo-4.13a-data_types.patch
View File

@ -1,32 +0,0 @@
diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
const char *carried_over_ptr;
size_t carried_over_len, carried_over_count;
const char *cur_ptr = mbi_cur_ptr (iter);
- int cur_len = mb_len (mbi_cur (iter));
+ size_t cur_len = mb_len (mbi_cur (iter));
int replen;
int delim = 0;
int rc;
@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
mbi_advance (iter))
{
const char *cur_ptr = mbi_cur_ptr (iter);
- int cur_len = mb_len (mbi_cur (iter));
+ size_t cur_len = mb_len (mbi_cur (iter));
if (cur_len == 1)
{
@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
mbi_advance (iter))
{
const char *cur_ptr = mbi_cur_ptr (iter);
- int cur_len = mb_len (mbi_cur (iter));
- int replen;
+ size_t cur_len = mb_len (mbi_cur (iter));
+ size_t replen;
if (cur_ptr >= endp)
break;

23
texinfo-4.13a-help-index-segfault.patch
View File

@ -1,23 +0,0 @@
diff -up texinfo-4.13/info/indices.c.orig texinfo-4.13/info/indices.c
--- texinfo-4.13/info/indices.c.orig 2010-08-31 12:04:38.317462471 +0200
+++ texinfo-4.13/info/indices.c 2010-08-31 12:11:49.322624552 +0200
@@ -192,6 +192,7 @@ do_info_index_search (WINDOW *window, in
index for, build and remember an index now. */
fb = file_buffer_of_window (window);
if (!initial_index_filename ||
+ !fb ||
(FILENAME_CMP (initial_index_filename, fb->filename) != 0))
{
info_free_references (index_index);
@@ -287,8 +288,9 @@ index_entry_exists (WINDOW *window, char
return 0;
fb = file_buffer_of_window (window);
- if (!initial_index_filename
- || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
+ if (!initial_index_filename ||
+ !fb ||
+ (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
{
info_free_references (index_index);
index_index = info_indices_of_file_buffer (fb);

20
texinfo-4.13a-makeinfo-sectioning.patch
View File

@ -1,20 +0,0 @@
diff -up texinfo-4.13/makeinfo/sectioning.c.orig texinfo-4.13/makeinfo/sectioning.c
--- texinfo-4.13/makeinfo/sectioning.c.orig 2010-11-10 11:24:53.000000000 +0100
+++ texinfo-4.13/makeinfo/sectioning.c 2010-11-10 11:25:28.000000000 +0100
@@ -256,14 +256,14 @@ current_chapter_number (void)
return xstrdup ("");
else if (enum_marker == APPENDIX_MAGIC)
{
- char s[1];
+ char s[2];
sprintf (s, "%c", numbers[0] + 64);
return xstrdup (s);
}
else
{
char s[5];
- sprintf (s, "%d", numbers[0]);
+ sprintf (s, "%4d", numbers[0]);
return xstrdup (s);
}
}

11
texinfo-4.13a-mosdo-crash.patch
View File

@ -1,11 +0,0 @@
--- texinfo-4.13/install-info/install-info.c.mosdo-crash 2009-09-02 20:18:44.000000000 -0400
+++ texinfo-4.13/install-info/install-info.c 2009-09-02 20:19:53.000000000 -0400
@@ -1765,7 +1765,7 @@
err = argz_add (&argz, &argz_len, opt);
free (opt); opt = NULL;
- opt = xmalloc (strlen (regex) + sizeof ("--section="));
+ opt = xmalloc (strlen (title) + sizeof ("--section="));
if (sprintf (opt, "--section=%s", title) == -1)
err = 1;
if (!err)

8
texinfo-4.13a-powerpc.patch
View File

@ -1,7 +1,7 @@
diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c
--- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100
+++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100
@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil
diff -up texinfo-5.0/install-info/install-info.c.orig texinfo-5.0/install-info/install-info.c
--- texinfo-5.0/install-info/install-info.c.orig 2013-02-18 13:12:08.367509306 +0100
+++ texinfo-5.0/install-info/install-info.c 2013-02-18 13:13:06.573834074 +0100
@@ -816,7 +816,7 @@ open_possibly_compressed_file (char *fil
}
else
{ /* It's a plain file, seek back over the magic bytes. */

12
texinfo-4.13a-texi2dvi-regexp.patch
View File

@ -1,12 +0,0 @@
diff -up texinfo-4.13/util/texi2dvi.orig texinfo-4.13/util/texi2dvi
--- texinfo-4.13/util/texi2dvi.orig 2010-10-11 14:08:21.340831908 +0200
+++ texinfo-4.13/util/texi2dvi 2010-10-11 14:12:14.235841752 +0200
@@ -1683,7 +1683,7 @@ input_file_name_decode ()
# If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
# prepend `./' in order to avoid that the tools take it as an option.
- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
+ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \
|| command_line_filename="./$command_line_filename"
# See if the file exists. If it doesn't we're in trouble since, even

50
texinfo.spec
View File

@ -2,28 +2,20 @@
Summary: Tools needed to create Texinfo format documentation files
Name: texinfo
Version: 4.13a
Release: 20%{?dist}
Version: 5.0
Release: 1%{?dist}
License: GPLv3+
Group: Applications/Publishing
Url: http://www.gnu.org/software/texinfo/
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.lzma
Source1: info-dir
Source2: texi2pdf.man
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
Source1: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig
Source2: info-dir
Patch0: texinfo-4.12-zlib.patch
Patch1: texinfo-4.13a-data_types.patch
# Patch2: is already upstream
Patch2: texinfo-4.13a-mosdo-crash.patch
Patch3: texinfo-4.13a-powerpc.patch
# Patch4: accepted by upstream, bz579263
Patch4: texinfo-4.13a-help-index-segfault.patch
# Patch5: already upstream, bz641534
Patch5: texinfo-4.13a-texi2dvi-regexp.patch
# Patch6: already upstream, bz651314
Patch6: texinfo-4.13a-makeinfo-sectioning.patch
Patch1: texinfo-4.13a-powerpc.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires: zlib-devel, ncurses-devel, help2man
Requires: perl >= 5.7.3
BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper)
%description
Texinfo is a documentation system that can produce both online
@ -60,14 +52,9 @@ The texinfo-tex package provides tools to format Texinfo documents
for printing using TeX.
%prep
%setup -q -n %{name}-4.13
%setup -q
%patch0 -p1 -b .zlib
%patch1 -p1 -b .data_types
%patch2 -p1 -b .mosdo-crash
%patch3 -p1 -b .powerpc
%patch4 -p1 -b .help-index-segfault
%patch5 -p1 -b .texi2dvi-regexp
%patch6 -p1 -b .makeinfo-sectioning
%patch1 -p1 -b .powerpc
%build
%configure
@ -81,8 +68,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{tex_texinfo}
install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo}
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/texi2pdf.1
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_infodir}/dir
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_infodir}/dir
mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
# Convert ChangeLog to UTF-8
@ -90,7 +76,8 @@ mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
touch -r ChangeLog ChangeLog_utf8
mv ChangeLog_utf8 ChangeLog
%find_lang %name
%find_lang %{name}
%find_lang %{name}_document
%post
if [ -f %{_infodir}/texinfo.gz ]; then # --excludedocs?
@ -127,8 +114,8 @@ fi
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
%files -f %{name}.lang
%doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO COPYING
%files -f %{name}.lang -f %{name}_document.lang
%doc AUTHORS ChangeLog NEWS README TODO COPYING
%{_bindir}/makeinfo
%{_datadir}/texinfo
%{_infodir}/texinfo*
@ -153,13 +140,20 @@ fi
%{_bindir}/texi2dvi
%{_bindir}/texi2pdf
%{_bindir}/pdftexi2dvi
%{_bindir}/pod2texi
%{_bindir}/texi2any
%{tex_texinfo}/
%{_mandir}/man1/texindex.1*
%{_mandir}/man1/texi2dvi.1*
%{_mandir}/man1/texi2pdf.1*
%{_mandir}/man1/pdftexi2dvi.1*
%{_mandir}/man1/pod2texi.1*
%{_mandir}/man1/texi2any.1*
%changelog
* Tue Feb 19 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.0-1
- Update to texinfo-5.0
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.13a-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild