From cc487604163ef48793f4caaf0bcfeebcc17ad773 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Sep 24 2008 14:46:30 +0000 Subject: - Removed patch fuzz. --- diff --git a/a2ps-external-libtool.patch b/a2ps-external-libtool.patch index 93b5cf7..5780160 100644 --- a/a2ps-external-libtool.patch +++ b/a2ps-external-libtool.patch @@ -1,12 +1,13 @@ ---- a2ps-4.13/configure.external-libtool 2007-02-28 22:32:48.000000000 +0100 -+++ a2ps-4.13/configure 2007-02-28 22:32:48.000000000 +0100 -@@ -2673,7 +2673,8 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" +diff -up a2ps-4.14/configure.external-libtool a2ps-4.14/configure +--- a2ps-4.14/configure.external-libtool 2008-09-24 15:28:13.000000000 +0100 ++++ a2ps-4.14/configure 2008-09-24 15:28:13.000000000 +0100 +@@ -21864,7 +21864,8 @@ fi + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' +#LIBTOOL='$(SHELL) $(top_builddir)/libtool' +LIBTOOL='/usr/bin/libtool' - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. + # Prevent multiple expansion + diff --git a/a2ps-mb.patch b/a2ps-mb.patch index 2f79272..daa4ea3 100644 --- a/a2ps-mb.patch +++ b/a2ps-mb.patch @@ -1,7 +1,8 @@ ---- a2ps-4.13/lib/psgen.c.mb 2006-10-25 16:16:44.000000000 +0100 -+++ a2ps-4.13/lib/psgen.c 2006-10-25 16:18:54.000000000 +0100 -@@ -97,7 +97,8 @@ - fprintf(stderr,"%d\n",job->status->face); +diff -up a2ps-4.14/lib/psgen.c.mb a2ps-4.14/lib/psgen.c +--- a2ps-4.14/lib/psgen.c.mb 2008-09-24 15:29:30.000000000 +0100 ++++ a2ps-4.14/lib/psgen.c 2008-09-24 15:29:30.000000000 +0100 +@@ -96,7 +96,8 @@ ps_escape_char (a2ps_job * job, uchar c, + /* Printable, but not 7bit clean caracters */ if (encoding_char_exists (job->encoding, job->status->face, c) && ((0177 < c) || (c < 040))) { - sprintf ((char *)res, "%s\\%o", res, c); @@ -10,7 +11,7 @@ return 1; } -@@ -894,8 +895,8 @@ +@@ -893,8 +894,8 @@ ps_print_char (a2ps_job * job, int c, en if (c > 127 && encoding_get_composite_flag (job->encoding) && job->status->face != Symbol) { if (mb_flag) { diff --git a/a2ps.spec b/a2ps.spec index 3277e50..34e646c 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -13,7 +13,7 @@ Summary: Converts text and other types of files to PostScript(TM) Name: a2ps Version: 4.14 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Group: Applications/Publishing Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz @@ -288,6 +288,9 @@ exit 0 %{emacs_lispdir}/*.el %changelog +* Wed Sep 24 2008 Tim Waugh 4.14-6 +- Removed patch fuzz. + * Thu May 29 2008 Tim Waugh 4.14-5 - Removed old patches.