auto-import a2ps-4.13b-14 from a2ps-4.13b-14.src.rpm

This commit is contained in:
cvsdist 2004-09-09 02:51:20 +00:00
commit 7d4fb2eef2
2 changed files with 4 additions and 62 deletions

View file

@ -1,45 +0,0 @@
--- a2ps-4.13/lib/printlen.c.orig Fri Jun 1 16:38:21 2001
+++ a2ps-4.13/lib/printlen.c Fri Jun 1 16:38:28 2001
@@ -28,14 +28,15 @@
unsigned long strtoul ();
static int
-int_printflen (const char *format, va_list *args)
+int_printflen (const char *format, va_list args)
{
const char *cp;
int total_width = 0;
int width = 0;
va_list ap;
- memcpy (&ap, args, sizeof (va_list));
+ __va_copy(ap, args);
+ /* memcpy (&ap, args, sizeof (va_list)); */
for (cp = format ; *cp ; cp++)
{
@@ -99,7 +100,7 @@
int
vprintflen (const char *format, va_list args)
{
- return int_printflen (format, &args);
+ return int_printflen (format, args);
}
int
--- a2ps-4.13/lib/title.c.orig Fri Jun 1 16:19:04 2001
+++ a2ps-4.13/lib/title.c Fri Jun 1 16:20:16 2001
@@ -83,11 +83,13 @@
VA_START (args, format);
len = vprintflen (format, args);
+ va_end(args);
if (format [strlen (format) - 1] == '\n')
len --;
if (center_p)
for (padding = 0 ; padding < 79 - len ; padding += 2)
putc (' ', stream);
+ VA_START (args, format);
# if HAVE_VPRINTF || _LIBC
vfprintf (stream, format, args);
# else

View file

@ -1,5 +1,5 @@
%define ver 4.13b
%define rel 13b
%define rel 14
Summary: Converts text and other types of files to PostScript(TM).
Name: a2ps
@ -17,7 +17,6 @@ Patch4: a2ps-4.13-glibcpaper.patch
# EUC-JP support
Patch10: a2ps-4.13-eucjp.patch.bz2
Patch11: a2ps-4.13-autoenc.patch
Patch12: a2ps-4.13-varargs.patch
Requires: fileutils sh-utils info
Buildrequires: /usr/bin/emacs
Url: http://www.inf.enst.fr/~demaille/a2ps/
@ -41,18 +40,9 @@ and medias.
%patch10 -p1 -b .euc
%patch11 -p1 -b .ae
%patch12 -p1 -b .va
libtoolize --copy --force
%build
# like libtoolize, but different
%ifarch s390 s390x
for file in config.sub config.guess ; do
for place in `find . -type f -name $file` ; do
cp -f /usr/share/libtool/$file $place
done
done
%endif
touch `find $PWD`
EMACS=emacs ./configure \
--prefix=/usr \
@ -149,11 +139,8 @@ fi
%dir %{_datadir}/a2ps
%changelog
* Fri Jun 1 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
- fixed varargs-usage in title.c
* Fri May 4 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
- ported to IBM zSeries (s390x, 64 bit)
* Thu Apr 26 2001 Florian La Roche <Florian.LaRoche@redhat.de>
- call libtoolize to allow easy porting to new archs
* Thu Feb 28 2001 SATO Satoru <ssato@redhat.com>
- bunzip2-ed all patches except eucjp