updated a2ps

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6169 ec354946-7b23-47d6-9f5a-488ba84defc7

a/a2ps/a2ps-vl.spec

@@ -1,8 +1,8 @@
 Summary: Converts text and other types of files to PostScript(TM).
 Summary(ja): テキストなどのPostscriptへのフィルタ
 Name: a2ps
-Version: 4.13b
+Version: 4.14
-Release: 58%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Publishing
 URL: http://www.inf.enst.fr/~demaille/a2ps/
@@ -11,14 +11,14 @@ Source1: ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz
 Source2: a2ps.sh
 Patch0: a2ps-4.13-conf.patch
 Patch1: a2ps-4.13-etc.patch
-Patch2: a2ps-4.13-flex.patch
 Patch3: a2ps-4.13-security.patch
 Patch4: a2ps-4.13-glibcpaper.patch
-Patch5: a2ps-4.13-varargs.patch
 Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
+Patch8: a2ps-iso5-minus.patch
+Patch9: a2ps-perl.patch
 # EUC-JP support
-Patch10: a2ps-4.13-eucjp.patch.bz2
+Patch10: a2ps-4.13-eucjp.patch
 Patch11: a2ps-4.13-autoenc.patch
 Patch12: a2ps-4.13b-attr.patch
 Patch13: a2ps-4.13b-numeric.patch
@@ -27,17 +27,18 @@ Patch15: a2ps-4.13b-tilde.patch
 Patch16: a2ps-4.13b-rm.patch
 Patch17: a2ps-4.13-euckr.patch
 Patch18: a2ps-4.13-gnusource.patch
-Patch19: a2ps-4.13-bison.patch
+Patch22: a2ps-4.13-hebrew.patch
-Patch20: a2ps-4.13-hebrew.patch
-Patch21: a2ps-4.13-malloc.patch
-Patch22: a2ps-shell.patch
-Patch23: a2ps-includes.patch
-Patch24: a2ps-underquoted.patch
-Patch25: a2ps-autoconf.patch
 Patch26: a2ps-make-fonts-map.patch
 Patch27: a2ps-netscape.patch
 Patch28: a2ps-wdiff.patch
 Patch29: a2ps-U.patch
+Patch31: a2ps-mb.patch
+Patch34: a2ps-external-libtool.patch
+Patch35: a2ps-4.14-texinfo-nodes.patch
+Patch36: a2ps-forward-null.patch
+Patch37: a2ps-overrun-dynamic.patch
+Patch38: a2ps-overrun-static.patch
+Patch39: a2ps-resource-leak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: emacsen, gperf, flex, automake, autoconf, texinfo
 Requires: fileutils, sh-utils, info, mktemp
@@ -49,7 +50,7 @@ Distribution: Vine Linux
 
 # Vine Patches
 Patch100: a2ps-4.13b-ptex.patch
-Patch101: a2ps-4.13-po.patch
+Patch101: a2ps-4.14-ja_po.patch
 Patch102: a2ps-4.13-printers.patch
 Patch103: a2ps-4.13-pdf.patch
 Patch104: a2ps-4.13-x86_64.patch
@@ -70,15 +71,14 @@ a2psは優れた印刷能力をもった, テキストを PostScriptへ変換す
 刷することができます。
 
 %prep
-%setup -q -n %{name}-4.13 -a 1
+%setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1 -b .security
 %patch4 -p1 -b .glibcpaper
-%patch5 -p1
-%patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
+%patch8 -p1 -b .iso5-minus
+%patch9 -p1 -b .perl
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -93,49 +93,46 @@ a2psは優れた印刷能力をもった, テキストを PostScriptへ変換す
 # Fix koi8 tilde (bug #66393).
 %patch15 -p1 -b .tilde
 
-# Prevent configure from going interactive (bug #70333).
-%patch16 -p1 -b .rm
-
 # Add Korean resource file (bug #81421).
 %patch17 -p1 -b .euckr
 
 # Prevent strsignal segfaulting (bug #104970).
 %patch18 -p1 -b .gnusource
 
-# Fix problems in .y file spotted by stricter bison.
-%patch19 -p1 -b .bison
-
 # Hebrew support (bug #113191).
-%patch20 -p1 -b .hebrew
+%patch22 -p1 -b .hebrew
-
-# Prevent "error: conflicting types for 'malloc'".
-%patch21 -p1 -b .malloc
-
-# Use environment variable to pass filenames to shell (bug #128647).
-%patch22 -p1 -b .shell
 
-# Apply patch from bug #122699 to fix "too many includes" error.
+# Use external libtool (bug #225235).
-%patch23 -p1 -b .includes
+%patch34 -p1 -b .external-libtool
-
-# Fixed m4 files.
-%patch24 -p1 -b .underquoted
-
-# Fixed configure.in.
-%patch25 -p1 -b .autoconf
 
 # Fix problems in make_fonts_map script (bug #142299).  Patch from
 # Michal Jaegermann.
 %patch26 -p1 -b .make-fonts-map
 
-# Don't try to run netscape.  Run mozilla instead (bug #121393).
-%patch27 -p1 -b .netscape
-
 # Make pdiff default to not requiring wdiff (bug #68537).
 %patch28 -p1 -b .wdiff
 
 # Make pdiff use diff(1) properly (bug #156916).
 %patch29 -p1 -b .U
 
+# Fixed multibyte handling (bug #212154).
+%patch31 -p1 -b .mb
+
+# Remove dots in node names, patch from Vitezslav Crhonek (Bug #445971)
+%patch35 -p1 -b .nodes
+
+# Coverity fix (forward-null).
+%patch36 -p1 -b .forward-null
+
+# Coverity fix (overrun-dynamic).
+%patch37 -p1 -b .overrun-dynamic
+
+# Coverity fix (overrun-static).
+%patch38 -p1 -b .overrun-static
+
+# Coverity fix (resource-leak).
+%patch39 -p1 -b .resource-leak
+
 #
 # Vine patches
 #
@@ -144,7 +141,7 @@ a2psは優れた印刷能力をもった, テキストを PostScriptへ変換す
 %patch100 -p1 -b .ptex
 
 # year-month-day fix
-#%patch101 -p0 -b .po
+%patch101 -p0 -b .po
 
 # default output to stdout
 %patch102 -p0 -b .print
@@ -152,19 +149,24 @@ a2psは優れた印刷能力をもった, テキストを PostScriptへ変換す
 # for ps2pdf
 %patch103 -p1 -b .pdf
 
-# for x86_64
+for file in AUTHORS ChangeLog; do
-%patch104 -p0 -b .x86_64
+  iconv -f latin1 -t UTF-8 < $file > $file.utf8
+  touch -c -r $file $file.utf8
+  mv $file.utf8 $file
+done
 
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 
-%__libtoolize --copy --force
+#%__libtoolize --copy --force
-%__cp %{_datadir}/aclocal/libtool.m4 m4/
+#%__cp %{_datadir}/aclocal/libtool.m4 m4/
-%__aclocal -I m4
+#%__aclocal -I m4
-%__autoconf
+#%__autoconf
+
+rm -f po/ja.gmo
 
 %build
-chmod 644 {po/ja.po,encoding/euc-jp.edf,README.eucJP}.euc
+chmod 644 {encoding/euc-jp.edf,README.eucJP}.euc
 chmod 644 encoding/euc-kr.edf.euckr
 touch `find $PWD`
 EMACS=emacs ./configure \
@@ -182,13 +184,13 @@ find . -name "*.info*" -exec rm -f {} \;
 # force rebuilding scanners by flex - patched or not
 find src lib -name '*.l' -exec touch {} \;
 # these scanners use 'lineno' - incompatible with -CFe flex flags
-(
+#(
-    cd src
+#    cd src
-    /bin/sh ../auxdir/ylwrap "flex" sheets-map.l lex.yy.c sheets-map.c --
+#    /bin/sh ../auxdir/ylwrap "flex" sheets-map.l lex.yy.c sheets-map.c --
-    /bin/sh ../auxdir/ylwrap "flex" lexssh.l lex.yy.c lexssh.c --
+#    /bin/sh ../auxdir/ylwrap "flex" lexssh.l lex.yy.c lexssh.c --
-    cd ../lib
+#    cd ../lib
-    /bin/sh ../auxdir/ylwrap "flex" lexppd.l lex.yy.c lexppd.c --
+#    /bin/sh ../auxdir/ylwrap "flex" lexppd.l lex.yy.c lexppd.c --
-)
+#)
 
 make CFLAGS="$RPM_OPT_FLAGS"
 
@@ -249,8 +251,7 @@ fi
 %config(noreplace) %{_sysconfdir}/a2ps-site.cfg
 %doc AUTHORS ChangeLog COPYING NEWS README TODO THANKS
 %{_bindir}/*
-%{_libdir}/*.a
+%{_libdir}/*.so*
-%{_libdir}/*.la
 %{_includedir}/*
 %{_infodir}/a2ps.info*
 %{_infodir}/ogonkify.info*
@@ -271,6 +272,10 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Mon May 07 2012 KOBAYASHI Taizo <tkoba@vinelinux.org> 4.14-1
+- new upstream release
+- a2ps.sh: fix handling options
+
 * Fri Apr 20 2012 Munehiro Yamamoto <munepi@vinelinux.org> 4.13b-58
 - updated a2ps-4.13b-ptex.patch: replaced jbibtex with pbibtex