From 31d1dfdb70bf461f16584bbcf52a1a0bbac9d344271702f1144b412fbf6fa733 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 5 Mar 2008 22:52:36 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/a2ps?expand=0&rev=6

---
 a2ps.changes |   5 +++
 a2ps.sh      |  12 +++--
 a2ps.spec    | 123 ++++++++++++++++++++++++++-------------------------
 3 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/a2ps.changes b/a2ps.changes
index 3c7ec6b..3ca0466 100644
--- a/a2ps.changes
+++ b/a2ps.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar  4 15:31:30 CET 2008 - werner@suse.de
+
+- Work around reencoded fonts from ogonkify in wdiff screen mode
+
 -------------------------------------------------------------------
 Fri Apr 20 09:39:17 CEST 2007 - aj@suse.de
 
diff --git a/a2ps.sh b/a2ps.sh
index ba36015..71e9d08 100644
--- a/a2ps.sh
+++ b/a2ps.sh
@@ -55,7 +55,7 @@ fi
 # Why sed? Just to get the `=' back instead of ` ' the
 # empty space which are inserted by getopt(1)
 #
-CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed "s|--\([a-z-]\+\) \?\('\)|--\1=\2|g")
+CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r "s|--([a-z-]+)[[:space:]]?(')|--\1=\2|g;s|-([vaE])[[:space:]]('[^-])|-\1\2|g")
 
 #
 # Just for encoding given on command line:
@@ -68,11 +68,17 @@ case "${CMDLINE}" in
 	exec -a a2ps a2ps.bin ${1+"$@"}
 esac
 
+#
+# Work around ogonkify bug which cause not defined fontsize
+#
+case "${CMDLINE}" in
+   *-E\'wdiff\'*) ENC=ISO-8859-1
+esac
 #
 # To not fool the bash with eval here
 #
-  FILES=$(echo "$CMDLINE" | LC_ALL=POSIX sed  "s|.* -- \?\(.*\)|\1|")
-CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed  "s|\(.*\) -- \?.*|\1|")
+  FILES=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r "s|.*[[:space:]]--[[:space:]]?(.*)|\1|")
+CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r "s|(.*)[[:space:]]--[[:space:]]?.*|\1|")
 
 test -z "$FILES" && FILES="'-'"
 
diff --git a/a2ps.spec b/a2ps.spec
index 3518b2e..695d946 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package a2ps (Version 4.13)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -9,17 +9,18 @@
 #
 
 
+
 Name:           a2ps
 BuildRequires:  autoconf automake emacs-nox flex ghostscript-fonts-std gv psutils texlive-latex xorg-x11-devel
-URL:            http://www.gnu.org/software/a2ps/a2ps.html
-License:        GNU General Public License (GPL)
+Url:            http://www.gnu.org/software/a2ps/a2ps.html
+License:        GPL v2 or later
 Group:          Productivity/Publishing/PS
 Provides:       a2ps-bin
 Requires:       /bin/sed /usr/bin/iconv /usr/bin/file /usr/bin/wdiff /usr/bin/w3m ghostscript-fonts-std
-Autoreqprov:    on
+AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Version:        4.13
-Release:        1126
+Release:        1241
 Summary:        Converts ASCII Text into PostScript
 Source:         a2ps-4.13b.tar.bz2
 Source1:        a2ps-ko.po
@@ -137,135 +138,137 @@ test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 /usr/share/ogonkify
 
 %changelog
-* Fri Apr 20 2007 - aj@suse.de
+* Tue Mar 04 2008 werner@suse.de
+- Work around reencoded fonts from ogonkify in wdiff screen mode
+* Fri Apr 20 2007 aj@suse.de
 - Use texlive for building.
-* Fri Mar 30 2007 - ssommer@suse.de
+* Fri Mar 30 2007 ssommer@suse.de
 - add flex to BuildRequires
-* Mon Feb 19 2007 - werner@suse.de
+* Mon Feb 19 2007 werner@suse.de
 - Removed the test file Convert.java and its resulting ps files
   from source tar ball due license problems.
-* Thu Feb 08 2007 - ro@suse.de
+* Thu Feb 08 2007 ro@suse.de
 - added defattr
-* Fri May 19 2006 - werner@suse.de
+* Fri May 19 2006 werner@suse.de
 - Fix reencode_font macro in base.ps (bug #176360)
-* Thu Apr 27 2006 - cthiel@suse.de
+* Thu Apr 27 2006 cthiel@suse.de
 - removed acroread from BuildRequires
 - added patch to fake acoread on ix86 and x86_64
-* Thu Feb 23 2006 - werner@suse.de
+* Thu Feb 23 2006 werner@suse.de
 - Use w3m to get ascii from html and the use a2ps its self to
   get PostScript out of ASCII. (bug #152470)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Sat Jan 14 2006 - schwab@suse.de
+* Sat Jan 14 2006 schwab@suse.de
 - Don't strip binaries.
-* Thu Jan 12 2006 - werner@suse.de
+* Thu Jan 12 2006 werner@suse.de
 - Use the gcc stack protector
-* Fri Dec 02 2005 - werner@suse.de
+* Fri Dec 02 2005 werner@suse.de
 - Fix handling of long options without arguments in a2ps script
-* Tue Sep 20 2005 - yxu@suse.de
+* Tue Sep 20 2005 yxu@suse.de
 - Add prototypes for functions
-* Fri Jun 17 2005 - werner@suse.de
+* Fri Jun 17 2005 werner@suse.de
 - The pdiff requires wdiff (bug #91335)
-* Fri May 13 2005 - werner@suse.de
+* Fri May 13 2005 werner@suse.de
 - Allow spaces in file names
-* Fri May 13 2005 - werner@suse.de
+* Fri May 13 2005 werner@suse.de
 - Add a wrapper script for converting UTF-8 text _partly_ into the
   natural latin encoding of the given language enviroment (#43348)
-* Sat Apr 02 2005 - coolo@suse.de
+* Sat Apr 02 2005 coolo@suse.de
 - remove conflicting prototype
-* Mon Oct 25 2004 - ro@suse.de
+* Mon Oct 25 2004 ro@suse.de
 - locale rename: no -> nb
-* Wed Aug 25 2004 - werner@suse.de
+* Wed Aug 25 2004 werner@suse.de
 - Escapes file names so that the shell groks it in single quotes
-* Thu Mar 18 2004 - werner@suse.de
+* Thu Mar 18 2004 werner@suse.de
 - More temporary file security issues (bug #36368)
-* Wed Aug 06 2003 - werner@suse.de
+* Wed Aug 06 2003 werner@suse.de
 - Partly workaround for ASCII and UTF-8 (mapp them to ISO 8859-15,
   bug #28348)
-* Mon Jul 28 2003 - werner@suse.de
+* Mon Jul 28 2003 werner@suse.de
 - Fix keyword Lette(r)  (bug #27411)
-* Wed Jun 11 2003 - kukuk@suse.de
+* Wed Jun 11 2003 kukuk@suse.de
 - Use %%find_lang macro
 - Fix filelist
 - Fix neededforbuild for emacs
-* Thu Apr 24 2003 - ro@suse.de
+* Thu Apr 24 2003 ro@suse.de
 - fix install_info --delete call and move from preun to postun
-* Tue Feb 11 2003 - kukuk@suse.de
+* Tue Feb 11 2003 kukuk@suse.de
 - Add install-info macros [Bug #23390]
-* Mon Nov 11 2002 - ro@suse.de
+* Tue Nov 12 2002 ro@suse.de
 - changed neededforbuild <xshared> to <x-devel-packages>
-* Wed Sep 18 2002 - ro@suse.de
+* Wed Sep 18 2002 ro@suse.de
 - removed bogus self-provides
-* Sun Jul 28 2002 - kukuk@suse.de
+* Sun Jul 28 2002 kukuk@suse.de
 - remove bzip from neededforbuild
-* Thu Jul 04 2002 - werner@suse.de
+* Thu Jul 04 2002 werner@suse.de
 - Add README's and a2ps.html to package doc dir (bug # 16229)
-* Thu May 23 2002 - ro@suse.de
+* Thu May 23 2002 ro@suse.de
 - use libdir
-* Mon Feb 25 2002 - pblahos@suse.cz
+* Mon Feb 25 2002 pblahos@suse.cz
 - filtering mozilla output in iso-8859-2 removed, mozilla does it
   correctly now, only stripping Title.
-* Wed Jan 23 2002 - okir@suse.de
+* Wed Jan 23 2002 okir@suse.de
 - Fixed tempfile problem in fixnt
-* Fri Dec 07 2001 - werner@suse.de
+* Fri Dec 07 2001 werner@suse.de
 - Enable automagic LC_PAPER and LC_CTYPE detection within
   a2ps-site.cfg
-* Fri Aug 31 2001 - pblahos@suse.cz
+* Fri Aug 31 2001 pblahos@suse.cz
 - implemented filtering of mozilla output in iso-8859-2
-* Fri Jul 20 2001 - kukuk@suse.de
+* Fri Jul 20 2001 kukuk@suse.de
 - changed neededforbuild <gs_lib> to <ghostscript-library>
-* Mon May 07 2001 - mfabian@suse.de
+* Mon May 07 2001 mfabian@suse.de
 - bzip2 sources
-* Thu Apr 26 2001 - werner@suse.de
+* Thu Apr 26 2001 werner@suse.de
 - We've to use dots within floats (#7284)
 - Fix manual page (#7192)
-* Tue Apr 24 2001 - werner@suse.de
+* Tue Apr 24 2001 werner@suse.de
 - Add Euro symbol to afm of ogonkify fonts
 - Implement code to be able to use LC_PAPER and LC_CTYPE for
   paper size and default encoding.
-* Thu Apr 19 2001 - werner@suse.de
+* Thu Apr 19 2001 werner@suse.de
 - Use newest ogonkify to get eurifyFont working
 - Include dummy metric for Euro sign to get it work with
   ghostscript and real PostScript printers (ogonkify -e L9 -E)
-* Wed Mar 14 2001 - ro@suse.de
+* Wed Mar 14 2001 ro@suse.de
 - use emacs-x11 for now
-* Tue Mar 13 2001 - ro@suse.de
+* Tue Mar 13 2001 ro@suse.de
 - added emacs-nox to neededforbuild
-* Fri Jan 26 2001 - violiet@suse.de
+* Fri Jan 26 2001 violiet@suse.de
 - remove Korean filter file = a2ps-h
-* Tue Jan 23 2001 - violiet@suse.de
+* Tue Jan 23 2001 violiet@suse.de
 - added Korean filter file = a2ps-h
 - improvement Korean message file.
-* Mon Jan 15 2001 - werner@suse.de
+* Mon Jan 15 2001 werner@suse.de
 - Fix the temporary file patch.
-* Wed Jan 10 2001 - werner@suse.de
+* Wed Jan 10 2001 werner@suse.de
 - Add temporary file patch
-* Fri Nov 17 2000 - werner@suse.de
+* Fri Nov 17 2000 werner@suse.de
 - Update to version 4.13(b)
 - Include some package to use automatic configuration for
 - Set PSFONT_PATH to /usr/share/ghostscript/fonts
-* Fri Nov 17 2000 - ro@suse.de
+* Fri Nov 17 2000 ro@suse.de
 - ge_exec -> emacs
-* Fri Jul 07 2000 - ro@suse.de
+* Fri Jul 07 2000 ro@suse.de
 - merged patches
-* Thu Jul 06 2000 - werner@suse.de
+* Thu Jul 06 2000 werner@suse.de
 - Add `,' to atan2 in for77kwds.ssh to distinguish atan2 from cabs.
-* Fri Apr 07 2000 - bk@suse.de
+* Fri Apr 07 2000 bk@suse.de
 - added suse update config macro
-* Fri Feb 25 2000 - kukuk@suse.de
+* Fri Feb 25 2000 kukuk@suse.de
 - Fill out copyright and group tag
 - Move /usr/{info,man} -> /usr/share/{info,man}
-* Thu Jan 13 2000 - werner@suse.de
+* Thu Jan 13 2000 werner@suse.de
 - Fix a2ps path in a2ps.el
 - Add all page names and their sizes known by ghostscript
-* Thu Dec 16 1999 - werner@suse.de
+* Thu Dec 16 1999 werner@suse.de
 - Fix Bug (NULL pointer if --title="" is used)
 - Remove Makefile.Linux
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Mon Jul 19 1999 - florian@suse.de
+* Mon Jul 19 1999 florian@suse.de
 - update to a2ps 4.12
-* Wed Oct 29 1997 - florian@suse.de
+* Thu Oct 30 1997 florian@suse.de
 - add missing patch detectet by Werner Fink
   Added the changes from Andreas Klemm for apsfilter into /usr/bin/a2ps.
   aps could use standard /usr/bin/a2ps now.