1
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=38
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
4d5fa97363
commit
030e3dec3a
@ -1,13 +0,0 @@
|
||||
Index: texinfo-4.13/configure.ac
|
||||
===================================================================
|
||||
--- texinfo-4.13.orig/configure.ac
|
||||
+++ texinfo-4.13/configure.ac
|
||||
@@ -13,7 +13,7 @@ AC_INIT([GNU Texinfo], [4.13], [bug-texi
|
||||
|
||||
dnl Must come before AM_INIT_AUTOMAKE.
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
-AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma])
|
||||
+AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-xz])
|
||||
|
||||
# Minimum Autoconf version required.
|
||||
AC_PREREQ(2.59)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,8 +0,0 @@
|
||||
--- doc/texi2html.1.in
|
||||
+++ doc/texi2html.1.in 2005-01-27 15:17:29.000000000 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-.TH TEXI2HTML 1 "@PACKAGE_DATE@"
|
||||
+.TH Texi2html 1 "@PACKAGE_DATE@" 1.76
|
||||
.AT 3
|
||||
.SH NAME
|
||||
texi2html \- a Texinfo to HTML converter
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1
|
||||
size 5046530
|
||||
@ -1,28 +0,0 @@
|
||||
--- texi2roff-2.0/table.c
|
||||
+++ texi2roff-2.0/table.c 2005-03-18 17:59:54.000000000 +0000
|
||||
@@ -32,13 +32,14 @@
|
||||
struct misccmds * cmds;
|
||||
struct tablerecd * table, * endoftable;
|
||||
|
||||
+static void patchtable();
|
||||
+
|
||||
void
|
||||
initialize(macropkg, showInfo, makeindex)
|
||||
int macropkg;
|
||||
int showInfo;
|
||||
int makeindex;
|
||||
{
|
||||
- extern void patchtable();
|
||||
int tablesize;
|
||||
|
||||
switch (macropkg) {
|
||||
--- texi2roff-2.0/texi2roff.c
|
||||
+++ texi2roff-2.0/texi2roff.c 2012-07-17 16:09:22.852010105 +0000
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
#include "texi2roff.h"
|
||||
|
||||
#if !defined(S_ISDIR) && defined(S_IFDIR)
|
||||
@ -1,58 +0,0 @@
|
||||
--- .pkgextract
|
||||
+++ .pkgextract
|
||||
@@ -0,0 +1 @@
|
||||
+bzcat ../texi2roff.patch.bz2 | patch -p0 -s -b --suffix=.Bader
|
||||
--- Makefile
|
||||
+++ Makefile
|
||||
@@ -1,14 +1,14 @@
|
||||
|
||||
# Makefile for Texinfo to nroff/troff translator (texi2roff)
|
||||
|
||||
-CC = cc
|
||||
+CC = gcc
|
||||
|
||||
# Flags:
|
||||
# -DBSD controls use of string(s).h and strchr/index only (not needed for Sun)
|
||||
# use -Dvoid=int for System III and V7
|
||||
|
||||
# problems have been reported for -O with Sun4's, SunOS 4.0.1
|
||||
-CFLAGS = -O -s
|
||||
+CFLAGS = $(RPM_OPT_FLAGS) -pipe
|
||||
# CFLAGS = -g
|
||||
# CFLAGS = -p
|
||||
# CFLAGS = -ql
|
||||
@@ -16,7 +16,7 @@
|
||||
OBJECTS = texi2roff.o table.o translate.o items.o
|
||||
|
||||
texi2roff: $(OBJECTS)
|
||||
- $(CC) -o $@ $(CFLAGS) $(OBJECTS) -lc_s -link -z
|
||||
+ $(CC) -o $@ $(CFLAGS) $(OBJECTS)
|
||||
|
||||
texi2roff.o : texi2roff.h
|
||||
|
||||
--- texi2index
|
||||
+++ texi2index
|
||||
@@ -14,7 +14,13 @@
|
||||
# characters that make troff drop lines and preserves sort order
|
||||
# for index entries containing typesetting commands.
|
||||
|
||||
-FILE="$*"
|
||||
+FILE="$@"
|
||||
+
|
||||
+if test -z "$FILE" ; then
|
||||
+ echo "${0##*/}: No index files of texi2roff call given," 1>&2
|
||||
+ echo " please read manual page of texi2roff." 1>&2
|
||||
+ exit 1
|
||||
+fi
|
||||
|
||||
sed -n "s/^../&\\\\\\&/p" $FILE \
|
||||
| sed "
|
||||
--- texi2roff.1
|
||||
+++ texi2roff.1
|
||||
@@ -1,4 +1,5 @@
|
||||
-.TH TEXI2ROFF 1
|
||||
+.TH Texi2roff 1 "1 Jan 90" "2.0"
|
||||
+.UC 1
|
||||
.DA 1 Jan 90
|
||||
.SH NAME
|
||||
texi2roff, texi2index \- convert Texinfo documents for formatting by troff.
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1e6a2ca1611d9c61f3c38a6a8ed537f9da2e22acc706b17109e7cab760e1c1e9
|
||||
size 45487
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9073a7f16de521da99b143515d940c8c85727e59968592f2d0ea5c31a64994e6
|
||||
size 7928
|
||||
@ -1,155 +0,0 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -224,6 +224,26 @@ AC_CONFIG_FILES([util/defs])
|
||||
AC_CHECK_PROGS([HEVEA], [hevea], [])
|
||||
AC_CHECK_PROGS([TEX], [tex], [])
|
||||
|
||||
+#
|
||||
+# Check for zlib and libbz2 libraries to use this together
|
||||
+# with SuSE's libzio to open compressed info files.
|
||||
+#
|
||||
+AC_CHECK_HEADER(zlib.h,[
|
||||
+ for lib in z gz
|
||||
+ do
|
||||
+ AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -l$lib" ; break])
|
||||
+ done])
|
||||
+AC_CHECK_HEADER(bzlib.h,[
|
||||
+ for lib in bz2 bzip2
|
||||
+ do
|
||||
+ AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -l$lib" ; break])
|
||||
+ done])
|
||||
+AC_CHECK_HEADER(zio.h,[
|
||||
+ AC_CHECK_LIB(zio, fzopen, [LIBS="$LIBS -lzio"
|
||||
+ AC_DEFINE(HAVE_ZIO, [],
|
||||
+ [Define to 1 if you have libzio for opening compressed info files.])])
|
||||
+ ])
|
||||
+
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
doc/Makefile
|
||||
--- install-info/install-info.c
|
||||
+++ install-info/install-info.c
|
||||
@@ -21,6 +21,9 @@
|
||||
#include <getopt.h>
|
||||
#include <regex.h>
|
||||
#include <argz.h>
|
||||
+#ifdef HAVE_ZIO
|
||||
+# include <zio.h>
|
||||
+#endif
|
||||
|
||||
#define TAB_WIDTH 8
|
||||
|
||||
@@ -655,15 +658,47 @@ open_possibly_compressed_file (char *fil
|
||||
|
||||
*opened_filename = filename;
|
||||
f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+#ifdef HAVE_ZIO
|
||||
+ if (!compression_program)
|
||||
+ compression_program = &local_compression_program;
|
||||
+ *compression_program = NULL;
|
||||
+ if (f)
|
||||
+ {
|
||||
+ nread = fread (data, sizeof (data), 1, f);
|
||||
+ if (nread == 1)
|
||||
+ {
|
||||
+ if (data[0] == '\x1f' && data[1] == '\x8b')
|
||||
+ *compression_program = "g";
|
||||
+ else if (data[0] == '\x1f' && data[1] == '\x9d')
|
||||
+ *compression_program = "Z";
|
||||
+ else if (data[0] == '\x1f' && data[1] == '\x9e')
|
||||
+ *compression_program = "z";
|
||||
+ else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
|
||||
+ *compression_program = "b";
|
||||
+ }
|
||||
+ fclose (f);
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+ }
|
||||
+#endif
|
||||
if (!f)
|
||||
{
|
||||
*opened_filename = concat (filename, ".gz", "");
|
||||
+#ifdef HAVE_ZIO
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+ *compression_program = "g";
|
||||
+#else
|
||||
f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+#endif
|
||||
if (!f)
|
||||
{
|
||||
free (*opened_filename);
|
||||
*opened_filename = concat (filename, ".bz2", "");
|
||||
+#ifdef HAVE_ZIO
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+ *compression_program = "b";
|
||||
+#else
|
||||
f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+#endif
|
||||
}
|
||||
if (!f)
|
||||
{
|
||||
@@ -695,7 +730,11 @@ open_possibly_compressed_file (char *fil
|
||||
/* And try opening it again. */
|
||||
free (*opened_filename);
|
||||
*opened_filename = filename;
|
||||
+#ifdef HAVE_ZIO
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+#else
|
||||
f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+#endif
|
||||
if (!f)
|
||||
pfatal_with_name (filename);
|
||||
}
|
||||
@@ -704,6 +743,7 @@ open_possibly_compressed_file (char *fil
|
||||
}
|
||||
}
|
||||
|
||||
+#ifndef HAVE_ZIO
|
||||
/* 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. */
|
||||
nread = fread (data, sizeof (data), 1, f);
|
||||
@@ -778,6 +818,9 @@ open_possibly_compressed_file (char *fil
|
||||
#endif
|
||||
*is_pipe = 0;
|
||||
}
|
||||
+#else
|
||||
+ *is_pipe = 0;
|
||||
+#endif /* HAVE_ZIO */
|
||||
|
||||
return f;
|
||||
}
|
||||
@@ -852,11 +895,23 @@ output_dirfile (char *dirfile, int dir_n
|
||||
int i;
|
||||
FILE *output;
|
||||
|
||||
+#ifndef HAVE_ZIO
|
||||
if (compression_program)
|
||||
{
|
||||
char *command = concat (compression_program, ">", dirfile);
|
||||
output = popen (command, "w");
|
||||
}
|
||||
+#else
|
||||
+ if (compression_program)
|
||||
+ {
|
||||
+ if (*compression_program == 'g' || *compression_program == 'z')
|
||||
+ output = fzopen (dirfile, "wg");
|
||||
+ if (*compression_program == 'b')
|
||||
+ output = fzopen (dirfile, "wb");
|
||||
+ if (*compression_program == 'Z')
|
||||
+ output = fzopen (dirfile, "wZ");
|
||||
+ }
|
||||
+#endif
|
||||
else
|
||||
output = fopen (dirfile, "w");
|
||||
|
||||
@@ -969,9 +1024,11 @@ output_dirfile (char *dirfile, int dir_n
|
||||
/* Some systems, such as MS-DOS, simulate pipes with temporary files.
|
||||
On those systems, the compressor actually gets run inside pclose,
|
||||
so we must call pclose. */
|
||||
+#ifndef HAVE_ZIO
|
||||
if (compression_program)
|
||||
pclose (output);
|
||||
else
|
||||
+#endif
|
||||
fclose (output);
|
||||
}
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
--- .pkgextract
|
||||
+++ .pkgextract
|
||||
@@ -0,0 +1,2 @@
|
||||
+patch -p0 -b --suffix=.zlib < ../texinfo-4.11-zlib.patch
|
||||
+patch -p0 -b --suffix=.echo < ../texinfo-4.8-echo.patch
|
||||
--- info/filesys.h
|
||||
+++ info/filesys.h
|
||||
@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
|
||||
|
||||
/* The default value of INFOPATH. */
|
||||
#if !defined (DEFAULT_INFOPATH)
|
||||
-# define DEFAULT_INFOPATH ".:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info"
|
||||
+# define DEFAULT_INFOPATH "/usr/local/share/info:/usr/local/info:/usr/local/lib/info:/usr/share/info:/usr/info:/usr/lib/info:/opt/gnu/info:/usr/share/xemacs/info:."
|
||||
#endif /* !DEFAULT_INFOPATH */
|
||||
|
||||
#if !defined (S_ISREG) && defined (S_IFREG)
|
||||
--- install-info/install-info.c
|
||||
+++ install-info/install-info.c
|
||||
@@ -2243,7 +2243,7 @@ There is NO WARRANTY, to the extent perm
|
||||
|
||||
/* Now Read the Info file and parse it into lines, unless we're
|
||||
removing exactly. */
|
||||
- if (!remove_exactly)
|
||||
+ if (!delete_flag)
|
||||
{
|
||||
if (debug_flag)
|
||||
printf ("debug: reading input file %s\n", infile);
|
||||
--- util/texi2dvi
|
||||
+++ util/texi2dvi
|
||||
@@ -291,25 +291,7 @@ absolute ()
|
||||
# Return true if PROG is somewhere in PATH, else false.
|
||||
findprog ()
|
||||
{
|
||||
- local saveIFS="$IFS"
|
||||
- IFS=$path_sep # break path components at the path separator
|
||||
- for dir in $PATH; do
|
||||
- IFS=$saveIFS
|
||||
- # The basic test for an executable is `test -f $f && test -x $f'.
|
||||
- # (`test -x' is not enough, because it can also be true for directories.)
|
||||
- # We have to try this both for $1 and $1.exe.
|
||||
- #
|
||||
- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
|
||||
- # also `test -f' has this enhancement, bot not on DJGPP. (Both are
|
||||
- # design decisions, so there is little chance to make them consistent.)
|
||||
- # Thusly, it seems to be difficult to make use of these enhancements.
|
||||
- #
|
||||
- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
|
||||
- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
|
||||
- return 0
|
||||
- fi
|
||||
- done
|
||||
- return 1
|
||||
+ type -p $1 > /dev/null 2>&1
|
||||
}
|
||||
|
||||
# report LINE1 LINE2...
|
||||
@@ -803,6 +785,11 @@ run_tex ()
|
||||
*) error 1 "$0: $out_lang not supported for $in_lang";;
|
||||
esac
|
||||
|
||||
+ if ! type -p $tex > /dev/null 2>&1 ; then
|
||||
+ echo "${0##*/}: requires $tex, please install texlive and texlive-latex" 1>&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+
|
||||
# Beware of aux files in subdirectories that require the
|
||||
# subdirectory to exist.
|
||||
case $in_lang:$tidy in
|
||||
@@ -915,6 +902,11 @@ run_bibtex ()
|
||||
texinfo) return;;
|
||||
esac
|
||||
|
||||
+ if ! type -p $bibtex > /dev/null 2>&1 ; then
|
||||
+ echo "${0##*/}: requires $bibtex, please install texlive and texlive-latex" 1>&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+
|
||||
# "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
|
||||
# The no .aux && \bibdata test is also for btxmac, in case it was the
|
||||
# first run of a bibtex-using document. Otherwise, it's possible that
|
||||
@@ -1673,7 +1665,7 @@ do
|
||||
sed 's,/,!,g'`
|
||||
esac
|
||||
# Remove it at exit if clean mode.
|
||||
- trap "cleanup" 0 1 2 15
|
||||
+ trap "cleanup" EXIT SIGHUP SIGINT SIGQUIT SIGBUS SIGPIPE SIGTERM
|
||||
|
||||
ensure_dir "$build_dir" "$t2ddir"
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
--- texinfo-4.13-/info/window.c 2008-09-18 20:31:59.000000000 +0200
|
||||
+++ texinfo-4.13/info/window.c 2010-09-20 21:32:41.941755338 +0200
|
||||
@@ -1581,7 +1581,7 @@
|
||||
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 @@
|
||||
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 @@
|
||||
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;
|
||||
@ -1,20 +0,0 @@
|
||||
--- util/texi2dvi
|
||||
+++ util/texi2dvi 2011-09-02 10:25:04.616426245 +0000
|
||||
@@ -78,7 +78,7 @@ newline='
|
||||
IFS="$space$tab$newline"
|
||||
|
||||
# In case someone pedantic insists on using grep -E.
|
||||
-: ${EGREP=egrep}
|
||||
+: ${EGREP=grep -E}
|
||||
|
||||
# Systems which define $COMSPEC or $ComSpec use semicolons to separate
|
||||
# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
|
||||
@@ -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
|
||||
@ -1,20 +0,0 @@
|
||||
--- makeinfo/sectioning.c 2008/09/26 11:56:28 1.30
|
||||
+++ makeinfo/sectioning.c 2011/01/15 00:23:19 1.32
|
||||
@@ -256,14 +256,14 @@
|
||||
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]);
|
||||
+ char s[100];
|
||||
+ sprintf (s, "%4d", numbers[0]);
|
||||
return xstrdup (s);
|
||||
}
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1f93ace1ec658c594bf0803493b6ee94a1a979659eee3785b80df7aae3d04abf
|
||||
size 1969110
|
||||
@ -1,26 +0,0 @@
|
||||
--- info/echo-area.c
|
||||
+++ info/echo-area.c Tue Jan 25 17:32:07 2005
|
||||
@@ -1502,7 +1502,7 @@
|
||||
void
|
||||
inform_in_echo_area (const char *message)
|
||||
{
|
||||
- int i;
|
||||
+ int i, len;
|
||||
char *text;
|
||||
int avail = EA_MAX_INPUT + 1 - input_line_end;
|
||||
|
||||
@@ -1512,7 +1512,13 @@
|
||||
text[i] = 0;
|
||||
|
||||
echo_area_initialize_node ();
|
||||
- sprintf (&input_line[input_line_end], "%s[%s]\n",
|
||||
+
|
||||
+ len = EA_MAX_INPUT - input_line_end;
|
||||
+ if (len <= 0) {
|
||||
+ free (text);
|
||||
+ return;
|
||||
+ }
|
||||
+ snprintf (&input_line[input_line_end], len, "%s[%s]\n",
|
||||
echo_area_is_active ? " ": "", text);
|
||||
free (text);
|
||||
the_echo_area->point = input_line_point;
|
||||
3
texinfo-5.2.tar.gz
Normal file
3
texinfo-5.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74
|
||||
size 7672236
|
||||
77
texinfo-zlib.patch
Normal file
77
texinfo-zlib.patch
Normal file
@ -0,0 +1,77 @@
|
||||
Index: texinfo-5.2/install-info/Makefile.in
|
||||
===================================================================
|
||||
--- texinfo-5.2.orig/install-info/Makefile.in
|
||||
+++ texinfo-5.2/install-info/Makefile.in
|
||||
@@ -201,7 +201,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) -lzio
|
||||
am__DEPENDENCIES_1 =
|
||||
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
|
||||
$(am__DEPENDENCIES_1)
|
||||
Index: texinfo-5.2/install-info/install-info.c
|
||||
===================================================================
|
||||
--- texinfo-5.2.orig/install-info/install-info.c
|
||||
+++ texinfo-5.2/install-info/install-info.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <getopt.h>
|
||||
#include <regex.h>
|
||||
#include <argz.h>
|
||||
+#include <zio.h>
|
||||
|
||||
#define TAB_WIDTH 8
|
||||
|
||||
@@ -687,10 +688,31 @@ open_possibly_compressed_file (char *fil
|
||||
|
||||
*opened_filename = filename;
|
||||
f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+ if (!compression_program)
|
||||
+ compression_program = &local_compression_program;
|
||||
+ *compression_program = NULL;
|
||||
+ if (f)
|
||||
+ {
|
||||
+ nread = fread (data, sizeof (data), 1, f);
|
||||
+ if (nread == 1)
|
||||
+ {
|
||||
+ if (data[0] == '\x1f' && data[1] == '\x8b')
|
||||
+ *compression_program = "g";
|
||||
+ else if (data[0] == '\x1f' && data[1] == '\x9d')
|
||||
+ *compression_program = "Z";
|
||||
+ else if (data[0] == '\x1f' && data[1] == '\x9e')
|
||||
+ *compression_program = "z";
|
||||
+ else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
|
||||
+ *compression_program = "b";
|
||||
+ }
|
||||
+ fclose (f);
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+ }
|
||||
if (!f)
|
||||
{
|
||||
*opened_filename = concat (filename, ".gz", "");
|
||||
- f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+ *compression_program = "g";
|
||||
}
|
||||
if (!f)
|
||||
{
|
||||
@@ -702,7 +724,8 @@ open_possibly_compressed_file (char *fil
|
||||
{
|
||||
free (*opened_filename);
|
||||
*opened_filename = concat (filename, ".bz2", "");
|
||||
- f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+ f = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
+ *compression_program = "b";
|
||||
}
|
||||
if (!f)
|
||||
{
|
||||
@@ -739,7 +762,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 = fzopen (*opened_filename, FOPEN_RBIN);
|
||||
if (!f)
|
||||
pfatal_with_name (filename);
|
||||
}
|
||||
@ -1,3 +1,71 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 6 17:51:37 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- Add perl(Locale::Messages) and perl(Text::Unidecode) Requires to
|
||||
makeinfo: since the switch to using the external ones, we also
|
||||
must ensure to have them present for the user to execute
|
||||
makeinfo. And makeinfo can be installed without texinfo (which
|
||||
already does require those modules too).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 6 15:58:27 UTC 2015 - werner@suse.de
|
||||
|
||||
- Avoid including builtin perl-libintl-perl but require the package
|
||||
- The same for perl-Text-Unidecode
|
||||
- Move %install_info_delete from %postun to %preun
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 6 11:12:09 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- Recommend instead of Require texi2html and texi2roff: they are
|
||||
not stricly required to operate texinfo, but can be valuable to
|
||||
the users installing it.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 5 20:23:34 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- Completely splitt off texi2html and texi2roff into their own
|
||||
package containers. As a consequence, we no longer carry those
|
||||
files / patches here (they live in their respective other
|
||||
packages): texi2html-1.78.dif, texi2html-5.0.tar.bz2,
|
||||
texi2html-5584.patch, texi2html.changes, texi2html.spec,
|
||||
texi2roff-2.0-gcc4.patch, texi2roff-2.0.dif, texi2roff-2.0.tar.gz,
|
||||
texi2roff.changes, texi2roff.patch.gz and texi2roff.spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 12 13:45:49 UTC 2014 - werner@suse.de
|
||||
|
||||
- Be aware that texinfo is GPL-3.0+
|
||||
- Require texi2html as well as readded texi2roff to make the build
|
||||
system happy
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 6 18:32:36 UTC 2014 - dmitry_r@opensuse.org
|
||||
|
||||
- Update to version 5.2
|
||||
* New texinfo commands
|
||||
* texi2any is the new generic converter for Texinfo that can
|
||||
produce all supported output formats, both those from texi2dvi
|
||||
(PDF/DVI) and from makeinfo (Info/HTML/etc.). texi2any and
|
||||
makeinfo are now different names for the same program; there
|
||||
are no differences in behavior based on the program name.
|
||||
* See more detail at included NEWS file
|
||||
* Remove obsolete texinfo-4.12.dif
|
||||
* Remove obsolete texi2html-1.78.dif
|
||||
* Remove obsolete texi2roff-2.0.dif
|
||||
* Remove obsolete texi2roff.patch.bz2
|
||||
* Remove obsolete texinfo-4.8-echo.patch
|
||||
* Remove obsolete texi2roff-2.0-gcc4.patch
|
||||
* Remove obsolete texinfo-4.13a-bug640417.diff
|
||||
* Remove obsolete texinfo-4.13a-bug713517.diff
|
||||
* Remove obsolete automake-1.12.patch
|
||||
* Remove obsolete texinfo-4.13a-bug788574.diff
|
||||
* Remove obsolete config-guess-sub-update.patch
|
||||
* Rebase texinfo-4.12-zlib.patch to texinfo-zlib.patch
|
||||
- Merge makeinfo into main package
|
||||
- Drop not maintained texi2roff
|
||||
- Drop not maintained texi2html
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 6 16:05:29 UTC 2013 - schwab@linux-m68k.org
|
||||
|
||||
|
||||
223
texinfo.spec
223
texinfo.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package texinfo
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,27 +17,33 @@
|
||||
|
||||
|
||||
Name: texinfo
|
||||
Version: 5.2
|
||||
Release: 0
|
||||
Summary: Tools Needed to Create Documentation from Texinfo Sources
|
||||
License: GPL-3.0+
|
||||
Group: Productivity/Publishing/Texinfo
|
||||
Url: http://www.gnu.org/software/texinfo/
|
||||
Source0: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.gz
|
||||
Source10: info-dir
|
||||
Patch1: texinfo-zlib.patch
|
||||
BuildRequires: automake
|
||||
BuildRequires: help2man
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libpth-devel
|
||||
BuildRequires: libzio-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: perl
|
||||
Requires: perl-Text-Unidecode
|
||||
Requires: perl-gettext
|
||||
Requires: perl-libintl-perl
|
||||
BuildRequires: perl-Text-Unidecode
|
||||
BuildRequires: perl-gettext
|
||||
BuildRequires: perl-libintl-perl
|
||||
BuildRequires: perl-macros
|
||||
BuildRequires: zlib-devel
|
||||
Version: 4.13a
|
||||
Release: 0
|
||||
%global version_t2h 1.82
|
||||
%global version_t2r 2.0
|
||||
Summary: Tools Needed to Create Documentation from Texinfo Sources
|
||||
License: GPL-2.0+ and GPL-3.0+
|
||||
Group: Productivity/Publishing/Texinfo
|
||||
Url: http://www.texinfo.org
|
||||
PreReq: %{install_info_prereq}
|
||||
Provides: texi2html = %{version_t2h}
|
||||
Provides: texi2roff = %{version_t2r}
|
||||
%if %suse_version > 1220
|
||||
Requires: latex2html
|
||||
Requires: makeinfo
|
||||
Requires: perl
|
||||
%if 0%{?suse_version} > 1220
|
||||
Requires: texlive-bibtex
|
||||
Requires: texlive-latex
|
||||
Requires: texlive-makeindex
|
||||
@ -45,24 +51,11 @@ Requires: texlive-pdftex
|
||||
Requires: texlive-tex
|
||||
Requires: texlive-texinfo
|
||||
%endif
|
||||
Source: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.bz2
|
||||
Source1: http://download.savannah.nongnu.org/releases/texi2html/texi2html-%{version_t2h}.tar.bz2
|
||||
# texinfo.org: the domain is expired.
|
||||
# http://texinfo.org/texi2roff/texi2roff-%{version_t2r}.tar.bz2
|
||||
Source2: texi2roff-%{version_t2r}.tar.bz2
|
||||
Source10: info-dir
|
||||
Patch: texinfo-4.12.dif
|
||||
Patch1: texi2html-1.78.dif
|
||||
Patch2: texi2roff-2.0.dif
|
||||
Patch3: texi2roff.patch.bz2
|
||||
Patch4: texinfo-4.12-zlib.patch
|
||||
Patch5: texinfo-4.8-echo.patch
|
||||
Patch6: texi2roff-2.0-gcc4.patch
|
||||
Patch7: texinfo-4.13a-bug640417.diff
|
||||
Patch8: texinfo-4.13a-bug713517.diff
|
||||
Patch9: automake-1.12.patch
|
||||
Patch10: texinfo-4.13a-bug788574.diff
|
||||
Patch11: config-guess-sub-update.patch
|
||||
%if 0%{?suse_version} > 1310
|
||||
Recommends: texi2html
|
||||
Recommends: texi2roff
|
||||
%endif
|
||||
Requires(pre): %{install_info_prereq}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -74,13 +67,10 @@ same Texinfo source file, you can create a menu-driven, online info
|
||||
file with nodes, menus, cross-references, and indices using the included
|
||||
makeinfo tool.
|
||||
|
||||
Aggregated with texinfo in this package is texi2html and texi2roff.
|
||||
|
||||
%package -n info
|
||||
%package -n info
|
||||
Summary: A Stand-Alone Terminal-Based Info Browser
|
||||
License: GPL-3.0+
|
||||
Group: Productivity/Publishing/Texinfo
|
||||
PreReq: bash
|
||||
Requires(pre): bash
|
||||
|
||||
%description -n info
|
||||
Info is a terminal-based program for reading documentation of computer
|
||||
@ -88,10 +78,14 @@ programs in the Info format. The GNU Project distributes most of its
|
||||
on-line manuals in the Info format, so you need a program called "Info
|
||||
reader" to read the manuals.
|
||||
|
||||
%package -n makeinfo
|
||||
%package -n makeinfo
|
||||
Summary: Translate Texinfo documents to info format
|
||||
License: GPL-3.0+
|
||||
Group: Productivity/Publishing/Texinfo
|
||||
Requires: perl
|
||||
# /usr/share/texinfo/Texinfo/Report.pm uses Locale::Messages
|
||||
Requires: perl(Locale::Messages)
|
||||
# /usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm uses Text::Unidecode
|
||||
Requires: perl(Text::Unidecode)
|
||||
Provides: texinfo:/usr/bin/makeinfo
|
||||
Suggests: texinfo
|
||||
|
||||
@ -101,127 +95,84 @@ formats, by default Info files suitable for reading online with Emacs
|
||||
or standalone GNU Info.
|
||||
|
||||
%prep
|
||||
rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r}
|
||||
%setup -q -b 1 -b 2 -n texinfo-4.13
|
||||
%patch4 -p0 -b .zlib
|
||||
%patch5 -p0 -b .echo
|
||||
%patch7 -p1 -b .size_t
|
||||
%patch8 -p0 -b .egrep
|
||||
%patch9 -p1
|
||||
%patch10 -p0 -b .appendix
|
||||
%patch -p0
|
||||
pushd ../texi2html-%{version_t2h}
|
||||
%patch1 -p0
|
||||
%patch11
|
||||
popd
|
||||
pushd ../texi2roff-%{version_t2r}
|
||||
%patch3 -p0 -b .Bader
|
||||
%patch2 -p0
|
||||
%patch6 -p1
|
||||
popd
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
HOST=%{_target_cpu}-suse-linux
|
||||
CFLAGS="$RPM_OPT_FLAGS -pipe"
|
||||
LDFLAGS=""
|
||||
CC=gcc
|
||||
export CFLAGS LDFLAGS CC
|
||||
export SUSE_ASNEEDED=0
|
||||
AUTOPOINT=true autoreconf -fi
|
||||
./configure --build=$HOST \
|
||||
--prefix=%{_prefix} \
|
||||
--mandir=%{_mandir} \
|
||||
--datadir=%{_datadir} \
|
||||
--infodir=%{_infodir} \
|
||||
--without-included-gettext \
|
||||
--enable-nls
|
||||
PATH=${PWD}/makeinfo:${PWD}/util:$PATH
|
||||
export PATH
|
||||
make %{?_smp_mflags};
|
||||
pushd ../texi2html-%{version_t2h}
|
||||
./configure --build=$HOST \
|
||||
--prefix=%{_prefix} \
|
||||
--mandir=%{_mandir} \
|
||||
--datadir=%{_datadir} \
|
||||
--infodir=%{_infodir} \
|
||||
--without-included-gettext \
|
||||
--enable-nls
|
||||
make %{?_smp_mflags};
|
||||
popd
|
||||
pushd ../texi2roff-%{version_t2r}
|
||||
rm -f texi2roff
|
||||
make %{?_smp_mflags};
|
||||
popd
|
||||
%configure --with-external-Text-Unidecode --with-external-libintl-perl --with-gnu-ld
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
export SUSE_ASNEEDED=0
|
||||
make DESTDIR=%{buildroot} \
|
||||
infodir=%{_infodir} \
|
||||
htmldir=%{_defaultdocdir}/texi2html install
|
||||
rm -f %{buildroot}%{_infodir}/info.info*
|
||||
mkdir -p %{buildroot}/sbin
|
||||
mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/
|
||||
ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info
|
||||
mkdir -p %{buildroot}%{_infodir}
|
||||
install -m 644 %{S:10} %{buildroot}%{_infodir}/dir
|
||||
pushd ../texi2html-%{version_t2h}
|
||||
make DESTDIR=%{buildroot} \
|
||||
infodir=%{_infodir} \
|
||||
texinfohtmldir=%{_defaultdocdir}/texi2html install
|
||||
install -m 644 README %{buildroot}%{_defaultdocdir}/texi2html/
|
||||
install -m 644 NEWS %{buildroot}%{_defaultdocdir}/texi2html/
|
||||
install -m 644 COPYING %{buildroot}%{_defaultdocdir}/texi2html/
|
||||
popd
|
||||
pushd ../texi2roff-%{version_t2r}
|
||||
doc=%{_defaultdocdir}/texi2roff
|
||||
install -m 755 texi2roff %{buildroot}%{_bindir}/
|
||||
install -m 755 texi2index %{buildroot}%{_bindir}/
|
||||
install -m 644 texi2roff.1 %{buildroot}%{_mandir}/man1/
|
||||
mkdir -p %{buildroot}${doc}
|
||||
install -m 644 Readme %{buildroot}${doc}
|
||||
install -m 644 copyright %{buildroot}${doc}
|
||||
popd
|
||||
%find_lang %name %{name}.lang
|
||||
%make_install
|
||||
if cmp %{buildroot}%{_bindir}/pdftexi2dvi %{buildroot}%{_bindir}/texi2pdf
|
||||
then
|
||||
rm -vf %{buildroot}%{_bindir}/pdftexi2dvi
|
||||
ln -sf texi2pdf %{buildroot}%{_bindir}/pdftexi2dvi
|
||||
fi
|
||||
if cmp %{buildroot}%{_mandir}/man1/pdftexi2dvi.1 %{buildroot}%{_mandir}/man1/texi2pdf.1
|
||||
then
|
||||
rm -vf %{buildroot}%{_mandir}/man1/pdftexi2dvi.1
|
||||
ln -sf texi2pdf.1.gz %{buildroot}%{_mandir}/man1/pdftexi2dvi.1.gz
|
||||
fi
|
||||
|
||||
%clean
|
||||
test -n "%{buildroot}" && rm -rf %{buildroot}
|
||||
rm -f %{buildroot}%{_bindir}/makeinfo
|
||||
cp %{buildroot}%{_bindir}/texi2any %{buildroot}%{_bindir}/makeinfo
|
||||
|
||||
mkdir -p %{buildroot}/sbin
|
||||
mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/
|
||||
ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info
|
||||
|
||||
install -m 644 %{SOURCE10} %{buildroot}%{_infodir}/dir
|
||||
|
||||
# part of emacs-info
|
||||
rm -f %{buildroot}%{_infodir}/info.info*
|
||||
|
||||
%find_lang %{name} %{name}.lang
|
||||
%find_lang %{name}_document %{name}_document.lang
|
||||
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/texi2html.info.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-1.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-2.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-3.gz
|
||||
|
||||
%postun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.gz
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/texi2html.info.gz
|
||||
%preun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-1.gz
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-2.gz
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-3.gz
|
||||
|
||||
%post -n info
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz
|
||||
|
||||
%postun -n info
|
||||
%preun -n info
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz
|
||||
|
||||
%files
|
||||
%files -f %{name}_document.lang
|
||||
%defattr(-, root, root)
|
||||
%dir %{_defaultdocdir}/texi2html
|
||||
%dir %{_defaultdocdir}/texi2roff
|
||||
%doc ABOUT-NLS AUTHORS COPYING INTRODUCTION NEWS README TODO
|
||||
%doc ABOUT-NLS AUTHORS COPYING NEWS README TODO
|
||||
%doc doc/texinfo.tex doc/txi-*.tex
|
||||
%doc %{_defaultdocdir}/texi2html/*
|
||||
%doc %{_defaultdocdir}/texi2roff/*
|
||||
%{_bindir}/pdftexi*
|
||||
%{_bindir}/texi*
|
||||
%{_bindir}/pod2texi
|
||||
%{_bindir}/texi2any
|
||||
%{_bindir}/texi2dvi
|
||||
%{_bindir}/texi2pdf
|
||||
%{_bindir}/texindex
|
||||
%{_bindir}/pdftexi2dvi
|
||||
%{_infodir}/texinfo*.gz
|
||||
%{_infodir}/texi2html*.gz
|
||||
%{_mandir}/man1/pod2texi.1.gz
|
||||
%{_mandir}/man1/texi2any.1.gz
|
||||
%{_mandir}/man1/texindex.1.gz
|
||||
%{_mandir}/man1/texi2dvi.1.gz
|
||||
%{_mandir}/man1/texi2pdf.1.gz
|
||||
%{_mandir}/man1/pdftexi2dvi.1.gz
|
||||
%{_mandir}/man1/texi*.1.gz
|
||||
%{_mandir}/man5/texinfo.5.gz
|
||||
%{_datadir}/texinfo
|
||||
%{_datadir}/texi2html
|
||||
|
||||
%files -n makeinfo -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/makeinfo
|
||||
%{_mandir}/man1/makeinfo.1.gz
|
||||
%{_datadir}/texinfo/
|
||||
|
||||
%files -n info
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user