rpms/texinfo/devel texinfo-4.11-zlib.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 texinfo.spec, 1.43, 1.44 texinfo-4.8-0xA0.patch, 1.1, NONE texinfo-4.8-zlib.patch, 1.1, NONE texinfo-4.9-texindex.patch, 1.1, NONE
Vitezslav Crhonek (vcrhonek)
fedora-extras-commits at redhat.com
Wed Sep 19 11:50:02 UTC 2007
Author: vcrhonek
Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202
Modified Files:
.cvsignore sources texinfo.spec
Added Files:
texinfo-4.11-zlib.patch
Removed Files:
texinfo-4.8-0xA0.patch texinfo-4.8-zlib.patch
texinfo-4.9-texindex.patch
Log Message:
Rebase to upstream texinfo-4.11, Resolves: #295441
texinfo-4.11-zlib.patch:
--- NEW FILE texinfo-4.11-zlib.patch ---
--- texinfo-4.11/util/Makefile.in_old 2007-09-10 02:37:45.000000000 +0200
+++ texinfo-4.11/util/Makefile.in 2007-09-19 10:29:06.000000000 +0200
@@ -110,7 +110,7 @@
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)
--- texinfo-4.11/util/install-info.c_old 2007-07-01 23:20:33.000000000 +0200
+++ texinfo-4.11/util/install-info.c 2007-09-19 10:40:02.000000000 +0200
@@ -20,6 +20,7 @@
#include "system.h"
#include <getopt.h>
#include <regex.h>
+#include <zlib.h>
static char *progname = "install-info";
@@ -559,7 +560,7 @@
COMPRESSION_PROGRAM. The compression program is determined by the
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)
@@ -567,7 +568,7 @@
char *local_opened_filename, *local_compression_program;
int nread;
char data[4];
- FILE *f;
+ gzFile *f;
/* We let them pass NULL if they don't want this info, but it's easier
to always determine it. */
@@ -575,16 +576,16 @@
opened_filename = &local_opened_filename;
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
if (!f)
{
*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, ".bz2", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#ifdef __MSDOS__
@@ -592,13 +593,13 @@
{
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)
@@ -610,7 +611,7 @@
/* 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);
}
@@ -621,12 +622,12 @@
/* 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);
- if (nread != 1)
+ nread = gzread (f, data, sizeof (data));
+ if (nread != sizeof (data))
{
/* Empty files don't set errno, so we get something like
"install-info: No error for foo", which is confusing. */
- if (nread == 0)
+ if (nread >= 0)
fatal (_("%s: empty file"), *opened_filename, 0);
pfatal_with_name (*opened_filename);
}
@@ -659,20 +660,22 @@
if (*compression_program)
{ /* It's compressed, so fclose the file and then open a pipe. */
+ FILE *p;
char *command = concat (*compression_program," -cd <", *opened_filename);
- if (fclose (f) < 0)
+ if (gzclose (f) < 0)
pfatal_with_name (*opened_filename);
- f = popen (command, "r");
- if (f)
+ p = popen (command, "r");
+ if (p)
*is_pipe = 1;
else
pfatal_with_name (command);
+ return p;
}
else
{ /* It's a plain file, seek back over the magic bytes. */
- if (fseek (f, 0, 0) < 0)
+ if (gzseek (f, 0, SEEK_SET) < 0)
pfatal_with_name (*opened_filename);
-#if O_BINARY
+#if 0 && O_BINARY
/* Since this is a text file, and we opened it in binary mode,
switch back to text mode. */
f = freopen (*opened_filename, "r", f);
@@ -697,7 +700,7 @@
char **compression_program)
{
char *real_name;
- FILE *f;
+ void *f;
int pipe_p;
int filled = 0;
int data_size = 8192;
@@ -711,7 +714,12 @@
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
+ nread = gzread (f, data + filled, data_size - filled);
if (nread < 0)
pfatal_with_name (real_name);
if (nread == 0)
@@ -733,7 +741,7 @@
if (pipe_p)
pclose (f);
else
- fclose (f);
+ gzclose (f);
*sizep = filled;
return data;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 31 Jul 2007 08:24:25 -0000 1.11
+++ .cvsignore 19 Sep 2007 11:49:29 -0000 1.12
@@ -1,3 +1,4 @@
texinfo-4.7.tar.bz2
texinfo-4.8.tar.bz2
texinfo-4.9.tar.bz2
+texinfo-4.11.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 31 Jul 2007 08:24:25 -0000 1.11
+++ sources 19 Sep 2007 11:49:29 -0000 1.12
@@ -1 +1 @@
-f4458e4b81e5469fa0815c35654141ab texinfo-4.9.tar.bz2
+c6bf13df4fbeff8ce874aacd6a51e814 texinfo-4.11.tar.bz2
Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- texinfo.spec 28 Aug 2007 11:08:32 -0000 1.43
+++ texinfo.spec 19 Sep 2007 11:49:29 -0000 1.44
@@ -1,16 +1,14 @@
Summary: Tools needed to create Texinfo format documentation files
Name: texinfo
-Version: 4.9
-Release: 2%{?dist}
+Version: 4.11
+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.bz2
Source1: info-dir
Source2: texi2pdf.man
-Patch0: texinfo-4.8-zlib.patch
-Patch1: texinfo-4.9-texindex.patch
-Patch2: texinfo-4.8-0xA0.patch
+Patch0: texinfo-4.11-zlib.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -61,8 +59,6 @@
%prep
%setup -q
%patch0 -p1 -b .zlib
-%patch1 -p1 -b .texindex
-%patch2 -p1 -b .0xA0
%build
@@ -140,6 +136,11 @@
%{_mandir}/man1/texi2pdf.1*
%changelog
+* Wed Sep 19 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-1
+- Rebase to upstream texinfo-4.11 (update zlib.patch, drop
+ texindex.patch and 0xA0.patch -- both included in upstream)
+ Resolves: #295441
+
* Tue Aug 28 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.9-2
- Fix license
- Rebuild
--- texinfo-4.8-0xA0.patch DELETED ---
--- texinfo-4.8-zlib.patch DELETED ---
--- texinfo-4.9-texindex.patch DELETED ---
More information about the fedora-extras-commits
mailing list