diff --git a/a2ps-4.13b-encoding.patch b/a2ps-4.13b-encoding.patch new file mode 100644 index 0000000..049de47 --- /dev/null +++ b/a2ps-4.13b-encoding.patch @@ -0,0 +1,43 @@ +--- a2ps-4.13/etc/a2ps-site.cfg.in.encoding 2002-05-30 17:15:42.000000000 +0100 ++++ a2ps-4.13/etc/a2ps-site.cfg.in 2002-05-30 17:15:42.000000000 +0100 +@@ -11,7 +11,7 @@ + ################################################################# + + # Default encoding +-Options: --encoding=@ENCODING@ ++#Options: --encoding=@ENCODING@ + + # Default medium + Options: --medium=@MEDIUM@ +--- a2ps-4.13/src/main.c.encoding 2002-05-30 17:15:42.000000000 +0100 ++++ a2ps-4.13/src/main.c 2002-05-30 17:15:42.000000000 +0100 +@@ -32,6 +32,7 @@ + /************************************************************************/ + #include + #include ++#include + #include + + #include "a2ps.h" +@@ -1021,9 +1022,8 @@ + sheets_map = sheets_map_new (); + style_sheets = new_style_sheets (); + +- /* Process special case: Japanese Document */ +- if (! strncmp (locale, "ja", 2) ) +- job->requested_encoding_name = xstrdup ("euc-jp"); ++ /* Use locale to set default encoding. */ ++ job->requested_encoding_name = xstrdup (nl_langinfo (CODESET)); + + /* Process the command line options. */ + argn = a2ps_handle_options (job, argc, argv); +--- a2ps-4.13/encoding/encoding.map.encoding 2002-05-30 17:28:42.000000000 +0100 ++++ a2ps-4.13/encoding/encoding.map 2002-05-30 17:29:07.000000000 +0100 +@@ -45,6 +45,7 @@ + latin1 iso1 + iso1 iso1 + iso-8859-1 iso1 ++ansi_x3.4-1968 iso1 + + latin2 iso2 + iso2 iso2 diff --git a/a2ps-4.13b-tilde.patch b/a2ps-4.13b-tilde.patch new file mode 100644 index 0000000..2a5d37b --- /dev/null +++ b/a2ps-4.13b-tilde.patch @@ -0,0 +1,11 @@ +--- a2ps-4.13/encoding/koi8.edf.tilde 2002-06-21 12:59:41.000000000 +0100 ++++ a2ps-4.13/encoding/koi8.edf 2002-06-21 13:00:02.000000000 +0100 +@@ -60,7 +60,7 @@ + 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 quoteleft + 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 tilde .notdef .notdef .notdef .notdef .notdef guillmotleft ++braceright asciitilde .notdef .notdef .notdef .notdef .notdef guillmotleft + guillmotright afii61352 .notdef .notdef .notdef .notdef .notdef + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef diff --git a/a2ps.spec b/a2ps.spec index 415b377..01b9b92 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -1,5 +1,5 @@ %define ver 4.13b -%define rel 19 +%define rel 23 Summary: Converts text and other types of files to PostScript(TM). Name: a2ps @@ -20,12 +20,15 @@ Patch10: a2ps-4.13-eucjp.patch.bz2 Patch11: a2ps-4.13-autoenc.patch Patch12: a2ps-4.13b-attr.patch Patch13: a2ps-4.13b-numeric.patch +Patch14: a2ps-4.13b-encoding.patch +Patch15: a2ps-4.13b-tilde.patch Requires: fileutils sh-utils info Buildrequires: /usr/bin/emacs Url: http://www.inf.enst.fr/~demaille/a2ps/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: psutils Obsoletes: a2ps-i18n +Provides: a2ps-i18n %description The a2ps filter converts text and other types of files to PostScript(TM). @@ -49,6 +52,12 @@ and medias. # Use C locale's decimal point style (bug #53715). %patch13 -p1 -b .numeric +# Use locale to determine a sensible default encoding (bug #64584). +%patch14 -p1 -b .encoding + +# Fix koi8 tilde (bug #66393). +%patch15 -p1 -b .tilde + libtoolize --copy --force %build @@ -148,6 +157,19 @@ fi %dir %{_datadir}/a2ps %changelog +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Fri Jun 21 2002 Tim Waugh 4.13b-22 +- Fix koi8 tilde (bug #66393). + +* Thu May 30 2002 Tim Waugh 4.13b-21 +- Provide a2ps-i18n (bug #65231). +- Fix default encoding (bug #64584). + +* Thu May 23 2002 Tim Powers 4.13b-20 +- automated rebuild + * Mon Feb 25 2002 Tim Waugh 4.13b-19 - Rebuild in new environment.