rpms/a2ps/devel a2ps-sort.patch,NONE,1.1 a2ps.spec,1.32,1.33

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7755

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-sort.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 4.13b-50
- Use sort correctly in make_font_map.sh (bug #187884).


a2ps-sort.patch:
 afm/make_fonts_map.sh            |    2 +-
 i18n-fonts-0.1/make_fonts_map.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE a2ps-sort.patch ---
--- a2ps-4.13/i18n-fonts-0.1/make_fonts_map.sh.sort	2006-04-04 13:49:44.000000000 +0100
+++ a2ps-4.13/i18n-fonts-0.1/make_fonts_map.sh	2006-04-04 13:52:00.000000000 +0100
@@ -80,7 +80,7 @@
 
 # Sort them by name, and keep a unique file for each font
 echo "Sorting entries..." 1>&2
-sort -u -t' ' +0 -1 fonts.map.new > fonts.map.tmp
+sort -u -t' ' -k1,2 fonts.map.new > fonts.map.tmp
 
 echo "Finishing." 1>&2
 cat > fonts.map.new <<EOF
--- a2ps-4.13/afm/make_fonts_map.sh.sort	2006-04-04 13:52:32.000000000 +0100
+++ a2ps-4.13/afm/make_fonts_map.sh	2006-04-04 13:52:40.000000000 +0100
@@ -72,7 +72,7 @@
 
 # Sort them by name, and keep a unique file for each font
 echo "Sorting entries..." 1>&2
-sort -u -t' ' +0 -1 fonts.map.new > fonts.map.tmp
+sort -u -t' ' -k1,2 fonts.map.new > fonts.map.tmp
 
 echo "Finishing." 1>&2
 cat > fonts.map.new <<EOF


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- a2ps.spec	15 Feb 2006 11:19:38 -0000	1.32
+++ a2ps.spec	4 Apr 2006 13:04:31 -0000	1.33
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 	49
+%define rel 	50
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -16,6 +16,7 @@
 Patch4: a2ps-4.13-glibcpaper.patch
 Patch5: a2ps-4.13-varargs.patch
 Patch6: a2ps-tmpdir.patch
+Patch7: a2ps-sort.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -61,6 +62,7 @@
 %patch4 -p1 -b .glibcpaper
 %patch5 -p1
 %patch6 -p1 -b .tmpdir
+%patch7 -p1 -b .sort
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -228,6 +230,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 4.13b-50
+- Use sort correctly in make_font_map.sh (bug #187884).
+
 * Wed Feb 15 2006 Tim Waugh <twaugh at redhat.com> 4.13b-49
 - Use mktemp in scripts.