rpms/texinfo/FC-4 texi2pdf.man, NONE, 1.1 texinfo-4.8-zlib.patch, NONE, 1.1 texinfo.spec, 1.26, 1.27 texinfo-4.3-zlib.patch, 1.3, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 20 15:39:05 UTC 2006
- Previous message (by thread): rpms/umb-scheme/FC-4 umb-scheme-3.2-define.patch, NONE, 1.1 umb-scheme-3.2-forwarding.patch, NONE, 1.1 umb-scheme-3.2.spec, 1.17, 1.18
- Next message (by thread): rpms/evince/devel .cvsignore, 1.19, 1.20 evince.spec, 1.36, 1.37 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mitr
Update of /cvs/dist/rpms/texinfo/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16535
Modified Files:
texinfo.spec
Added Files:
texi2pdf.man texinfo-4.8-zlib.patch
Removed Files:
texinfo-4.3-zlib.patch
Log Message:
* Fri Jan 20 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8.fc4.1
- Build for FC 4
--- NEW FILE texi2pdf.man ---
.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 at dbs\&.uni-hannover\&.de> (mailing list)\&.
.PP
Problems with \fBtexi2dvi\fP(1) should be reported to Karl Berry,
the texinfo maintainer, at <bug-texinfo at gnu\&.org> (mailing list)
.PP
.SH "AUTHOR"
.PP
Written by Thomas Esser
<te at dbs\&.uni-hannover\&.de>\&.
.PP
This manual page was written by C\&.M\&. Connelly
<c at 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)\&.
texinfo-4.8-zlib.patch:
Makefile.in | 2 +-
install-info.c | 46 +++++++++++++++++++++++++++-------------------
2 files changed, 28 insertions(+), 20 deletions(-)
--- NEW FILE texinfo-4.8-zlib.patch ---
--- texinfo-4.8/util/Makefile.in.zlib 2006-01-16 05:53:28.000000000 +0100
+++ texinfo-4.8/util/Makefile.in 2006-01-16 05:53:45.000000000 +0100
@@ -83,7 +83,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 $(am__DEPENDENCIES_1)
texindex_SOURCES = texindex.c
--- texinfo-4.8/util/install-info.c.zlib 2006-01-16 05:55:00.000000000 +0100
+++ texinfo-4.8/util/install-info.c 2006-01-16 06:03:40.000000000 +0100
@@ -20,6 +20,7 @@
#include "system.h"
#include <getopt.h>
+#include <zlib.h>
static char *progname = "install-info";
@@ -529,7 +530,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)
@@ -537,7 +538,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. */
@@ -545,16 +546,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__
@@ -562,13 +563,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)
@@ -580,7 +581,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);
}
@@ -591,12 +592,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);
}
@@ -629,20 +630,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);
@@ -667,7 +670,7 @@
char **compression_program)
{
char *real_name;
- FILE *f;
+ void *f;
int pipe_p;
int filled = 0;
int data_size = 8192;
@@ -681,7 +684,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)
@@ -703,7 +711,7 @@
if (pipe_p)
pclose (f);
else
- fclose (f);
+ gzclose (f);
*sizep = filled;
return data;
Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/FC-4/texinfo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- texinfo.spec 14 Oct 2005 09:55:27 -0000 1.26
+++ texinfo.spec 20 Jan 2006 15:39:00 -0000 1.27
@@ -1,13 +1,14 @@
Summary: Tools needed to create Texinfo format documentation files.
Name: texinfo
Version: 4.8
-Release: 4.1
+Release: 8.fc4.1
License: GPL
Group: Applications/Publishing
Url: http://www.gnu.org/software/texinfo/
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
Source1: info-dir
-Patch1: texinfo-4.3-zlib.patch
+Source2: texi2pdf.man
+Patch1: texinfo-4.8-zlib.patch
Patch2: texinfo-CAN-2005-3011.patch
Prereq: /sbin/install-info
Prefix: %{_prefix}
@@ -37,7 +38,7 @@
# ugly method of doing it (triggers which fire on set intersection would
# be better), but it's the best we can do for now. Talk to Erik before
# removing this.
-Prereq: bash
+Prereq: bash
%description -n info
The GNU project uses the texinfo file format for much of its
@@ -54,15 +55,14 @@
%configure
make %{?_smp_mflags}
-make -C util LIBS=%{_libdir}/libz.a
-
%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}/sbin
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
pushd ${RPM_BUILD_ROOT}
+ install -m644 %{SOURCE2} .%{_mandir}/man1/texi2pdf.1
gzip -n -9f .%{_infodir}/*info*
gzip -n -9f .%{_mandir}/*/*
install -m644 $RPM_SOURCE_DIR/info-dir .%{_infodir}/dir
@@ -70,7 +70,6 @@
popd
rm -f $RPM_BUILD_ROOT%{_datadir}/texinfo/texinfo.{xsl,dtd}
-rm -f $RPM_BUILD_ROOT%{_bindir}/texi2pdf
%find_lang %name
@@ -78,19 +77,20 @@
rm -rf ${RPM_BUILD_ROOT}
%post
-/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || :
%preun
if [ $1 = 0 ]; then
- /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir
+ /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir || :
fi
%post -n info
-/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir || :
%preun -n info
if [ $1 = 0 ]; then
- /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir
+ /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir \
+ || :
fi
%files -f %{name}.lang
@@ -100,16 +100,17 @@
%{_bindir}/makeinfo
%{_bindir}/texindex
%{_bindir}/texi2dvi
+%{_bindir}/texi2pdf
%{_datadir}/texinfo
%{_infodir}/texinfo*
%{_mandir}/man1/makeinfo.1*
%{_mandir}/man1/texindex.1*
%{_mandir}/man1/texi2dvi.1*
+%{_mandir}/man1/texi2pdf.1*
%{_mandir}/man5/texinfo.5*
%files -n info
%defattr(-,root,root)
-#%config(missingok) /etc/X11/applnk/Utilities/info.desktop
%config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir
%{_bindir}/info
%{_bindir}/infokey
@@ -122,9 +123,28 @@
%{_mandir}/man5/info.5*
%changelog
-* Fri Oct 14 2005 Tim Waugh <twaugh at redhat.com> 4.8-4.1
+* Fri Jan 20 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8.fc4.1
+- Build for FC 4
+
+* Mon Jan 16 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-9
+- Fix handling of bzip2'ed files (#128637)
+
+* Mon Jan 16 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8
+- Ignore scriptlet failures with --excludedocs (#166958)
+- Don't link texindex to zlib, don't pretend to link to zlib statically
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Oct 14 2005 Tim Waugh <twaugh at redhat.com> 4.8-7
- Apply patch to fix CAN-2005-3011 (bug #169585).
+* Thu Jun 9 2005 Tim Waugh <twaugh at redhat.com> 4.8-6
+- Ship texi2pdf man page, taken from tetex-2.0.2 RPM.
+
+* Tue Jun 7 2005 Tim Waugh <twaugh at redhat.com> 4.8-5
+- Ship texi2pdf (bug #147271).
+
* Mon Mar 14 2005 Tim Waugh <twaugh at redhat.com> 4.8-4
- Requires tetex (bug #151075).
--- texinfo-4.3-zlib.patch DELETED ---
- Previous message (by thread): rpms/umb-scheme/FC-4 umb-scheme-3.2-define.patch, NONE, 1.1 umb-scheme-3.2-forwarding.patch, NONE, 1.1 umb-scheme-3.2.spec, 1.17, 1.18
- Next message (by thread): rpms/evince/devel .cvsignore, 1.19, 1.20 evince.spec, 1.36, 1.37 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list