[enscript/f19: 2/2] Merge branch 'f17' into f19

[Tim Waugh]

commit 6fb4dfa4420ff181e64eb705c5da9e7166a9c82d
Merge: 8969d86 b3d5b46
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue May 14 17:00:29 2013 +0100

    Merge branch 'f17' into f19

 enscript-bufpos-crash.patch |   12 ++++++++++++
 enscript.spec               |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --cc enscript.spec
index c2d8fa0,2e1bba5..faccae2
--- a/enscript.spec
+++ b/enscript.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A plain ASCII to PostScript converter
  Name: enscript
 -Version: 1.6.5.2
 -Release: 6%{?dist}
 +Version: 1.6.6
- Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv3+
  Group: Applications/Publishing
  URL: http://www.gnu.org/software/enscript
@@@ -20,11 -22,10 +20,12 @@@ Patch3: enscript-1.6.1-locale.patc
  # RH #224548
  Patch8: enscript-wrap_header.patch
  
 -Patch9: enscript-1.6.4-rh457719.patch
  Patch10:enscript-1.6.4-rh457720.patch
  Patch12:enscript-rh477382.patch
 -Patch13: enscript-bufpos-crash.patch
 +Patch13:enscript-build.patch
 +Patch14:enscript-manfixes.patch
++Patch15: enscript-bufpos-crash.patch
 +
  Requires(preun): /sbin/install-info
  Requires(post): /sbin/install-info
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@@ -43,12 -44,13 +44,13 @@@ includes many options for customizing p
  
  %prep
  %setup -q
 -%patch1 -p1 -b .hilight
  %patch3 -p1 -b .locale
  %patch8 -p1 -b .wrap_header
 -%patch9 -p1 -b .rh457719
  %patch10 -p1 -b .rh457720
  %patch12 -p1 -b .rh477382
 -%patch13 -p1 -b .bufpos-crash
 +%patch13 -p1 -b .build
 +%patch14 -p1 -b .manfixes
++%patch15 -p1 -b .bufpos-crash
  
  %{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
  install -pm 644 %{SOURCE2} states/hl/php.st
@@@ -110,20 -111,8 +112,23 @@@ f
  %config(noreplace) %{_sysconfdir}/enscript.cfg
  
  %changelog
 -* Mon May 13 2013 Tim Waugh <twaugh at redhat.com> - 1.6.5.2-6
++* Mon May 13 2013 Tim Waugh <twaugh at redhat.com> - 1.6.6-4
++
+ - Fixed word-wrapping crash in tokenizer (bug #870639).
 +* Thu Apr 04 2013 Adam Tkac <atkac redhat com> - 1.6.6-3
 +- some manpage fixes
 +
 +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
 +* Wed Sep 26 2012 Adam Tkac <atkac redhat com> - 1.6.6-1
 +- update to 1.6.6
 +- paches merged
 +  - enscript-1.6.4-hilight.patch
 +  - enscript-1.6.4-rh457719.patch
 +
 +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5.2-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5.2-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild