rpms/a2ps/F-9 a2ps-4.13-conf.patch, 1.4, 1.5 a2ps-4.13-etc.patch, 1.2, 1.3 a2ps-4.13-euckr.patch, 1.1, 1.2 a2ps-4.13-hebrew.patch, 1.5, 1.6

Thu May 29 16:25:31 UTC 2008

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5545

Modified Files:
	a2ps-4.13-conf.patch a2ps-4.13-etc.patch a2ps-4.13-euckr.patch 
	a2ps-4.13-hebrew.patch 
Log Message:
Sync to devel.

a2ps-4.13-conf.patch:

Index: a2ps-4.13-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/F-9/a2ps-4.13-conf.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- a2ps-4.13-conf.patch	19 Nov 2005 03:22:25 -0000	1.4
+++ a2ps-4.13-conf.patch	29 May 2008 16:24:41 -0000	1.5
@@ -1,7 +1,8 @@
---- a2ps-4.13/configure.config	Wed Feb  9 09:32:31 2000
-+++ a2ps-4.13/configure	Thu Apr 27 19:56:05 2000
-@@ -8433,9 +8433,13 @@
- echo "configure:8434: checking for PostScript fonts path" 1>&5
+diff -up a2ps-4.14/configure.conf a2ps-4.14/configure
+--- a2ps-4.14/configure.conf	2008-04-27 01:01:04.000000000 +0200
++++ a2ps-4.14/configure	2008-04-27 01:04:12.000000000 +0200
+@@ -30758,9 +30758,13 @@ fi
+ echo $ECHO_N "checking for PostScript fonts path... $ECHO_C" >&6; }
  # Try to find some PostScript fonts.
  # Find out if ghostscript is installed
 +# for ac_dir in /usr/local/ghostscript/fonts \
@@ -11,14 +12,15 @@
 -  /usr/local/share/ghostscript/fonts;
 +for ac_dir in /usr/share/fonts/default/Type1 \
 +    /usr/share/fonts/default/ghostscript \
-+    /usr/share/fonts/afms/adobe \
-+    /usr/share/X11/fonts/Type1 ;
++    /usr/share/X11/fonts/Type1 \
++    /usr/share/fonts/culmus ;
  do
    if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
      ac_psfont_path="$ac_psfont_path:$ac_dir";
---- a2ps-4.13/configure.in.conf	2000-02-24 17:53:03.000000000 +0000
-+++ a2ps-4.13/configure.in	2004-12-09 16:25:14.984961138 +0000
-@@ -197,8 +197,10 @@
+diff -up a2ps-4.14/configure.in.conf a2ps-4.14/configure.in
+--- a2ps-4.14/configure.in.conf	2008-04-27 01:00:54.000000000 +0200
++++ a2ps-4.14/configure.in	2008-04-27 01:03:52.000000000 +0200
+@@ -207,8 +207,10 @@ AC_MSG_CHECKING(for PostScript fonts pat
  # Try to find some PostScript fonts.
  # Find out if ghostscript is installed
  ac_psfont_path=
@@ -26,8 +28,8 @@
 -  /usr/local/share/ghostscript/fonts;
 +for ac_dir in /usr/share/fonts/default/Type1 \
 +    /usr/share/fonts/default/ghostscript \
-+    /usr/share/fonts/afms/adobe \
-+    /usr/share/X11/fonts/Type1 ;
++    /usr/share/X11/fonts/Type1 \
++    /usr/share/fonts/culmus ;
  do
    if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
      ac_psfont_path="$ac_psfont_path:$ac_dir";

a2ps-4.13-etc.patch:

Index: a2ps-4.13-etc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/F-9/a2ps-4.13-etc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- a2ps-4.13-etc.patch	9 Mar 2007 12:34:21 -0000	1.2
+++ a2ps-4.13-etc.patch	29 May 2008 16:24:41 -0000	1.3
@@ -1,15 +1,27 @@
---- a2ps-4.13/etc/Makefile.in.etc	Wed Feb  9 09:32:55 2000
-+++ a2ps-4.13/etc/Makefile.in	Thu Apr 27 22:45:03 2000
-@@ -132,7 +132,7 @@
+diff -up a2ps-4.14/etc/a2ps_cfg.in.etc a2ps-4.14/etc/a2ps_cfg.in
+--- a2ps-4.14/etc/a2ps_cfg.in.etc	2007-12-29 02:38:58.000000000 +0100
++++ a2ps-4.14/etc/a2ps_cfg.in	2008-04-27 01:27:55.000000000 +0200
+@@ -73,6 +73,7 @@ LibraryPath: @libpath@
+ # It may be useful to extend it so that a2ps can see some
+ # TeX or X11 resources: it likes AFM files and PF[AB] files.
+ #AppendLibraryPath: foo
++AppendLibraryPath: @apppath@
  
  
- ogonkifydir = $(datadir)/ogonkify
+ #################################################################
+diff -up a2ps-4.14/etc/Makefile.am.etc a2ps-4.14/etc/Makefile.am
+--- a2ps-4.14/etc/Makefile.am.etc	2002-07-19 14:07:27.000000000 +0200
++++ a2ps-4.14/etc/Makefile.am	2008-04-27 01:27:55.000000000 +0200
+@@ -2,7 +2,7 @@
+ ## Makefile for a2ps' etc library directory.
+ 
+ ogonkifydir=$(datadir)/ogonkify
 -libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
 +libpath = $(sysconfdir)/$(PACKAGE):$(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
  
  pkgdata_DATA = README
  
-@@ -297,7 +297,9 @@
+@@ -40,7 +40,9 @@ DISTCLEANFILES = a2ps.cfg README
  
  # Building the correct a2ps.cfg
  a2ps.cfg: a2ps_cfg Makefile
@@ -20,18 +32,19 @@
  
  # Building a time stamp to know the version.
  README: README.in Makefile
---- a2ps-4.13/etc/Makefile.am.etc	1999-11-30 09:20:09.000000000 +0100
-+++ a2ps-4.13/etc/Makefile.am	2007-03-09 11:05:43.000000000 +0100
-@@ -2,7 +2,7 @@
- ## Makefile for a2ps' etc library directory.
- 
- ogonkifydir=$(datadir)/ogonkify
+diff -up a2ps-4.14/etc/Makefile.in.etc a2ps-4.14/etc/Makefile.in
+--- a2ps-4.14/etc/Makefile.in.etc	2007-12-29 04:28:07.000000000 +0100
++++ a2ps-4.14/etc/Makefile.in	2008-04-27 01:30:55.000000000 +0200
+@@ -262,7 +262,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ tex = @tex@
+ ogonkifydir = $(datadir)/ogonkify
 -libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
 +libpath = $(sysconfdir)/$(PACKAGE):$(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
- 
  pkgdata_DATA = README
- 
-@@ -40,7 +40,9 @@
+ dsysconf = $(DESTDIR)$(sysconfdir)
+ EXTRA_DIST = README.in
+@@ -482,7 +482,9 @@ uninstall-local:
  
  # Building the correct a2ps.cfg
  a2ps.cfg: a2ps_cfg Makefile
@@ -42,13 +55,5 @@
  
  # Building a time stamp to know the version.
  README: README.in Makefile
---- a2ps-4.13/etc/a2ps_cfg.in.etc	Tue Feb  8 03:24:03 2000
-+++ a2ps-4.13/etc/a2ps_cfg.in	Thu Apr 27 20:49:04 2000
-@@ -73,6 +73,7 @@
- # It may be useful to extend it so that a2ps can see some
- # TeX or X11 resources: it likes AFM files and PF[AB] files.
- #AppendLibraryPath: foo
-+AppendLibraryPath: @apppath@
- 
- 
- #################################################################
+diff -up a2ps-4.14/Makefile.am.etc a2ps-4.14/Makefile.am
+diff -up a2ps-4.14/Makefile.in.etc a2ps-4.14/Makefile.in

a2ps-4.13-euckr.patch:

Index: a2ps-4.13-euckr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/F-9/a2ps-4.13-euckr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a2ps-4.13-euckr.patch	9 Sep 2004 02:52:29 -0000	1.1
+++ a2ps-4.13-euckr.patch	29 May 2008 16:24:41 -0000	1.2
@@ -1,27 +1,22 @@
---- a2ps-4.13/encoding/Makefile.am.orig	2003-01-09 17:45:41.000000000 +0900
-+++ a2ps-4.13/encoding/Makefile.am	2003-01-09 17:45:50.000000000 +0900
-@@ -16,7 +16,7 @@
- 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
-+iso15.edf koi8.edf euc-jp.edf euc-kr.edf
- 
- if EXTENSIONS
- encodings_DATA = encoding.map $(major_encodings) $(minor_encodings)
---- a2ps-4.13/encoding/Makefile.in.orig	2003-01-09 17:46:09.000000000 +0900
-+++ a2ps-4.13/encoding/Makefile.in	2003-01-09 17:46:14.000000000 +0900
-@@ -141,7 +141,7 @@
- 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
-+iso15.edf koi8.edf euc-jp.edf euc-kr.edf
+diff -up a2ps-4.14/encoding/encoding.map.euckr a2ps-4.14/encoding/encoding.map
+--- a2ps-4.14/encoding/encoding.map.euckr	2008-04-27 01:46:59.000000000 +0200
++++ a2ps-4.14/encoding/encoding.map	2008-04-27 01:46:59.000000000 +0200
+@@ -100,6 +100,12 @@ japanese		euc-jp
+ ja			euc-jp
+ jp			euc-jp
  
- @EXTENSIONS_TRUE at encodings_DATA = @EXTENSIONS_TRUE at encoding.map $(major_encodings) $(minor_encodings)
- @EXTENSIONS_FALSE at encodings_DATA = @EXTENSIONS_FALSE at encoding.map $(major_encodings)
---- a2ps-4.13/encoding/euc-kr.edf.orig	2003-01-09 17:46:22.000000000 +0900
-+++ a2ps-4.13/encoding/euc-kr.edf	2003-01-09 17:47:34.000000000 +0900
++euc-kr			euc-kr
++euc-kr			euc-kr
++korean			euc-kr
++ko			euc-kr
++kr			euc-kr
++
+ ########################################################################
+ # Some architectures specific char sets
+ ########################################################################
+diff -up /dev/null a2ps-4.14/encoding/euc-kr.edf
+--- /dev/null	2008-04-26 20:48:40.298012400 +0200
++++ a2ps-4.14/encoding/euc-kr.edf	2008-04-27 01:46:59.000000000 +0200
 @@ -0,0 +1,104 @@
 +# Description of the EUC-KR encoding
 +# Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
@@ -127,18 +122,27 @@
 +egrave eacute ecircumflex edieresis igrave iacute icircumflex idieresis
 +eth ntilde ograve oacute ocircumflex otilde odieresis divide
 +oslash ugrave uacute ucircumflex udieresis yacute thorn ydieresis
---- a2ps-4.13/encoding/encoding.map.orig	2003-01-09 17:46:50.000000000 +0900
-+++ a2ps-4.13/encoding/encoding.map	2003-01-09 17:46:57.000000000 +0900
-@@ -100,6 +100,12 @@
- ja			euc-jp
- jp			euc-jp
+diff -up a2ps-4.14/encoding/Makefile.am.euckr a2ps-4.14/encoding/Makefile.am
+--- a2ps-4.14/encoding/Makefile.am.euckr	2008-04-27 01:46:59.000000000 +0200
++++ a2ps-4.14/encoding/Makefile.am	2008-04-27 01:47:58.000000000 +0200
+@@ -16,7 +16,7 @@ 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 ms-cp1251.edf euc-jp.edf
++iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
  
-+euc-kr			euc-kr
-+euc-kr			euc-kr
-+korean			euc-kr
-+ko			euc-kr
-+kr			euc-kr
-+
- ########################################################################
- # Some architectures specific char sets
- ########################################################################
+ if EXTENSIONS
+ encodings_DATA = encoding.map $(major_encodings) $(minor_encodings)
+diff -up a2ps-4.14/encoding/Makefile.in.euckr a2ps-4.14/encoding/Makefile.in
+--- a2ps-4.14/encoding/Makefile.in.euckr	2008-04-27 01:46:59.000000000 +0200
++++ a2ps-4.14/encoding/Makefile.in	2008-04-27 01:48:09.000000000 +0200
+@@ -270,7 +270,7 @@ 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 ms-cp1251.edf euc-jp.edf
++iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
+ 
+ @EXTENSIONS_FALSE at encodings_DATA = encoding.map $(major_encodings)
+ @EXTENSIONS_TRUE at encodings_DATA = encoding.map $(major_encodings) $(minor_encodings)

a2ps-4.13-hebrew.patch:

Index: a2ps-4.13-hebrew.patch
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/F-9/a2ps-4.13-hebrew.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- a2ps-4.13-hebrew.patch	13 Jul 2007 15:43:49 -0000	1.5
+++ a2ps-4.13-hebrew.patch	29 May 2008 16:24:41 -0000	1.6
@@ -1,18 +1,19 @@
---- 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/share/X11/fonts/Type1 ;
-+    /usr/share/X11/fonts/Type1 \
-+    /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
+diff -up a2ps-4.14/encoding/encoding.map.hebrew a2ps-4.14/encoding/encoding.map
+--- a2ps-4.14/encoding/encoding.map.hebrew	2008-04-27 01:50:14.000000000 +0200
++++ a2ps-4.14/encoding/encoding.map	2008-04-27 01:50:14.000000000 +0200
+@@ -65,6 +65,9 @@ iso-8859-5		iso5
+ 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.
+diff -up /dev/null a2ps-4.14/encoding/iso8.edf
+--- /dev/null	2008-04-26 20:48:40.298012400 +0200
++++ a2ps-4.14/encoding/iso8.edf	2008-04-27 01:50:14.000000000 +0200
 @@ -0,0 +1,77 @@
 +# Description of the ISO-8859-8 encoding
 +# Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
@@ -91,41 +92,27 @@
 +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
+diff -up a2ps-4.14/encoding/Makefile.am.hebrew a2ps-4.14/encoding/Makefile.am
+--- a2ps-4.14/encoding/Makefile.am.hebrew	2008-04-27 01:51:14.000000000 +0200
++++ a2ps-4.14/encoding/Makefile.am	2008-04-27 01:52:11.000000000 +0200
+@@ -15,7 +15,7 @@ encodingsdir = $(pkgdatadir)/encoding
+ 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	\
++iso3.edf iso4.edf iso5.edf iso7.edf iso8.edf iso9.edf iso10.edf iso13.edf	\
+ iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
  
-+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 @@
+ if EXTENSIONS
+diff -up a2ps-4.14/encoding/Makefile.in.hebrew a2ps-4.14/encoding/Makefile.in
+--- a2ps-4.14/encoding/Makefile.in.hebrew	2008-04-27 01:50:14.000000000 +0200
++++ a2ps-4.14/encoding/Makefile.in	2008-04-27 01:52:01.000000000 +0200
+@@ -269,7 +269,7 @@ encodingsdir = $(pkgdatadir)/encoding
  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
++iso3.edf iso4.edf iso5.edf iso7.edf iso8.edf iso9.edf iso10.edf iso13.edf	\
+ iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
  
- @EXTENSIONS_TRUE at encodings_DATA = @EXTENSIONS_TRUE at encoding.map $(major_encodings) $(minor_encodings)
- @EXTENSIONS_FALSE at encodings_DATA = @EXTENSIONS_FALSE at encoding.map $(major_encodings)
---- a2ps-4.13/configure.in.hebrew	2007-01-22 18:19:04.000000000 +0000
-+++ a2ps-4.13/configure.in	2007-01-22 18:19:16.000000000 +0000
-@@ -200,7 +200,9 @@
- for ac_dir in /usr/share/fonts/default/Type1 \
-     /usr/share/fonts/default/ghostscript \
-     /usr/share/fonts/afms/adobe \
--    /usr/share/X11/fonts/Type1 ;
-+    /usr/share/X11/fonts/Type1 \
-+    /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";
+ @EXTENSIONS_FALSE at encodings_DATA = encoding.map $(major_encodings)


