diff --git a/a2ps-4.13-bison.patch b/a2ps-4.13-bison.patch new file mode 100644 index 0000000..fcc89a6 --- /dev/null +++ b/a2ps-4.13-bison.patch @@ -0,0 +1,29 @@ +--- a2ps-4.13/src/parsessh.y.bison 2004-01-06 10:27:42.352903527 +0000 ++++ a2ps-4.13/src/parsessh.y 2004-01-06 10:28:14.328105348 +0000 +@@ -242,7 +242,7 @@ + /* Dealing with the inessential informations */ + /************************************************************************/ + requirement : +- tREQUIRES tA2PS tSTRING { $$ = $3 ; } ; ++ tREQUIRES tA2PS tSTRING { $$ = $3 ; } + | tREQUIRES tA2PS tVERSION tSTRING { $$ = $4 ; } ; + + documentation : +@@ -267,7 +267,7 @@ + authors : tWRITTEN tBY tSTRING { $$ = $3 ; }; + + version : +- tVERSION tIS tSTRING { $$ = $3 ; }; ++ tVERSION tIS tSTRING { $$ = $3 ; } + | tVERSION tSTRING { $$ = $2 ; }; + + /************************************************************************/ +@@ -717,7 +717,7 @@ + /* Only one */ + $$ = words_new ("Closing: Strings", "Closing: Regexps", 2, 2); + words_add_regex ($$, $1); +- }; ++ } + | tCLOSERS operators_def tCLOSERS + { + /* Several, comma separated, between () */ diff --git a/a2ps-4.13-hebrew.patch b/a2ps-4.13-hebrew.patch new file mode 100644 index 0000000..0246fd6 --- /dev/null +++ b/a2ps-4.13-hebrew.patch @@ -0,0 +1,118 @@ +--- a2ps-4.13/configure.hebrew 2004-01-09 15:29:44.000000000 +0200 ++++ a2ps-4.13/configure 2004-01-09 15:44:14.000000000 +0200 +@@ -8454,7 +8454,9 @@ + for ac_dir in /usr/share/fonts/default/Type1 \ + /usr/share/fonts/default/ghostscript \ + /usr/share/fonts/afms/adobe \ +- /usr/X11R6/lib/X11/fonts/latin2/Type1/afm ; ++ /usr/X11R6/lib/X11/fonts/latin2/Type1/afm \ ++ /usr/share/fonts/hebrew \ ++ /usr/share/fonts/he/Type1 ; + do + if test "cd $ac_dir 2>/dev/null && echo *.afm"; then + ac_psfont_path="$ac_psfont_path:$ac_dir"; +--- a2ps-4.13/encoding/iso8.edf.hebrew 2004-01-09 15:44:03.000000000 +0200 ++++ a2ps-4.13/encoding/iso8.edf 2004-01-09 15:44:03.000000000 +0200 +@@ -0,0 +1,77 @@ ++# Description of the ISO-8859-8 encoding ++# Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana ++# Copyright (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana ++# ++ ++# ++# This file is part of a2ps. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; see the file COPYING. If not, write to ++# the Free Software Foundation, 59 Temple Place - Suite 330, ++# Boston, MA 02111-1307, USA. ++# ++ ++Name: ISO-8859-8 ++ ++# This text is reproduced by a courtesy of Roman Czyborra ++# http://czyborra.com/charsets/iso8859.html ++Documentation ++The Hebrew (8bit) encoding ++EndDocumentation ++ ++# This file has been specifically adapted for use with Hebrew Culmus fonts ++ ++# If there is an unknown font requested, use Courier ++Default: MiriamMono-Book ++ ++# Automatic spell checking :) ++Substitute: Times David ++Substitute: Helvetica Nachlieli-Light ++Substitute: Helvetica-Bold Nachlieli-Bold ++Substitute: Courier MiriamMono-Book ++Substitute: Courier-Bold MiriamMono-Bold ++ ++Vector: ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++space exclam quotedbl numbersign dollar percent ampersand quotesingle ++parenleft parenright asterisk plus comma hyphen period slash ++zero one two three four five six seven ++eight nine colon semicolon less equal greater question ++at A B C D E F G ++H I J K L M N O ++P Q R S T U V W ++X Y Z bracketleft backslash bracketright asciicircum underscore ++grave a b c d e f g ++h i j k l m n o ++p q r s t u v w ++x y z braceleft bar braceright asciitilde .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++space exclamdown cent sterling currency yen brokenbar section ++dieresis copyright ordfeminine guillemotleft logicalnot hyphen registered macron ++degree plusminus twosuperior threesuperior acute mu paragraph bullet ++cedilla onesuperior ordmasculine guillemotright onequarter onehalf threequarters .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef ++notdef .notdef .notdef .notdef .notdef .notdef .notdef underscoredbl ++afii57664 afii57665 afii57666 afii57667 afii57668 afii57669 afii57670 afii57671 ++afii57672 afii57673 afii57674 afii57675 afii57676 afii57677 afii57678 afii57679 ++afii57680 afii57681 afii57682 afii57683 afii57684 afii57685 afii57686 afii57687 ++afii57688 afii57689 afii57690 .notdef .notdef .notdef .notdef .notdef +--- a2ps-4.13/encoding/encoding.map.hebrew ++++ a2ps-4.13/encoding/encoding.map +@@ -65,6 +65,9 @@ + iso7 iso7 + iso-8859-7 iso7 + ++iso8 iso8 ++iso-8859-8 iso8 ++ + # The following lines _are_not_an_error_. + # This is the right correspondance between ISO-8859 names + # and the Latin n nick name. +--- a2ps-4.13/encoding/Makefile.in.hebrew ++++ a2ps-4.13/encoding/Makefile.in +@@ -140,8 +140,8 @@ + major_encodings = ascii.edf iso1.edf + minor_encodings = \ + ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf \ +-iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf \ +-iso15.edf koi8.edf euc-jp.edf euc-kr.edf ++iso3.edf iso4.edf iso5.edf iso7.edf iso8.edf iso9.edf iso10.edf \ ++iso13.edf iso15.edf koi8.edf euc-jp.edf euc-kr.edf + + @EXTENSIONS_TRUE@encodings_DATA = @EXTENSIONS_TRUE@encoding.map $(major_encodings) $(minor_encodings) + @EXTENSIONS_FALSE@encodings_DATA = @EXTENSIONS_FALSE@encoding.map $(major_encodings) diff --git a/a2ps.spec b/a2ps.spec index ac12db5..467230f 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -1,5 +1,5 @@ %define ver 4.13b -%define rel 30 +%define rel 33 Summary: Converts text and other types of files to PostScript(TM). Name: a2ps @@ -25,11 +25,14 @@ 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 +Patch20: a2ps-4.13-hebrew.patch Requires: fileutils sh-utils info -Buildrequires: /usr/bin/emacs +BuildRequires: /usr/bin/emacs, gperf Url: http://www.inf.enst.fr/~demaille/a2ps/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: psutils +PreReq: sed, coreutils Obsoletes: a2ps-i18n Provides: a2ps-i18n @@ -70,6 +73,14 @@ and medias. # 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 + +# Fix reference to a2ps binary (bug #112930). +perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el libtoolize --copy --force %build @@ -175,6 +186,17 @@ fi %dir %{_datadir}/a2ps %changelog +* Fri Jan 16 2004 Tim Waugh 4.13b-33 +- Post scriptlet requires sed, coreutils (bug #107322). + +* Mon Jan 12 2004 Tim Waugh 4.13b-32 +- Hebrew support (bug #113191). + +* Tue Jan 6 2004 Tim Waugh 4.13b-31 +- Build requires gperf. +- Fix problems in .y file spotted by stricter bison. +- Fix reference to a2ps binary (bug #112930). + * Fri Oct 17 2003 Tim Waugh 4.13b-30 - Prevent strsignal segfaulting (bug #104970).