[ghostscript/f20: 3/3] Merge branch 'f19' into f20

[Tim Waugh]

commit 4aeef6dc397d28369b7d0d17e1e9306dcf691b84
Merge: 2f99dfa 24dae22
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Sep 25 17:04:15 2013 +0100

    Merge branch 'f19' into f20

 .gitignore          |    3 +++
 generate-tarball.sh |    8 ++++++++
 ghostscript.spec    |   13 +++++++++----
 sources             |    3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index b99de81,fc76c37..ab84514
--- a/.gitignore
+++ b/.gitignore
@@@ -32,9 -32,6 +32,12 @@@ ghostscript-8.71.tar.x
  /ghostscript-9.04.tar.bz2
  /ghostscript-9.05.tar.bz2
  /ghostscript-9.06.tar.bz2
+ /ghostscript-9.06-cleaned.tar.bz2
  /ghostscript-9.07.tar.bz2
+ /ghostscript-9.07-cleaned.tar.bz2
 +/ghostscript-9.08rc1.tar.gz
 +/ghostscript-9.08.tar.bz2
 +/ghostscript-9.09rc1.tar.gz
 +/ghostscript-9.09.tar.bz2
 +/ghostscript-9.10.tar.bz2
++/ghostscript-9.10-cleaned.tar.bz2
diff --cc ghostscript.spec
index 5d945c5,a52d0c0..55ddff0
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 1%{?dist}
 -Release: 15%{?dist}
++Release: 4%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -315,29 -370,17 +320,29 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
- * Mon Sep  9 2013 Tim Waugh <twaugh at redhat.com> 9.10-1
- - 9.10.
 -* Wed Sep 25 2013 Tim Waugh <twaugh at redhat.com> 9.07-15
++* Wed Sep 25 2013 Tim Waugh <twaugh at redhat.com> 9.09-4
+ - Regenerate tarball (bug #1000387).
  
 -* Wed Aug 28 2013 Tim Waugh <twaugh at redhat.com> 9.07-14
 +* Wed Aug 28 2013 Tim Waugh <twaugh at redhat.com> 9.09-3
  - Remove jpegxr to ensure it isn't built (bug #1000387).
  
 -* Thu Aug 22 2013 Tim Waugh <twaugh at redhat.com> 9.07-13
 +* Thu Aug 22 2013 Tim Waugh <twaugh at redhat.com> 9.09-2
  - Fixed character set conversion issue in pdfwrite (bug #999927).
  
 -* Wed Aug 21 2013 Tim Waugh <twaugh at redhat.com> 9.07-12
 -- Tweak filter costs for gstoraster (part of bug #998977).
 +* Thu Aug 22 2013 Tim Waugh <twaugh at redhat.com> 9.09-1
 +- 9.09.
 +
 +* Sat Aug 17 2013 Tim Waugh <twaugh at redhat.com> 9.09-0.rc1.1
 +- 9.09rc1.
 +
 +* Thu Aug 15 2013 Tim Waugh <twaugh at redhat.com> 9.08-1
 +- 9.08.
 +
 +* Mon Aug 12 2013 Tim Waugh <twaugh at redhat.com> 9.08-0.rc1.1
 +- 9.08rc1.  CUPS filters moved to the cups-filters package.
 +
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.07-12
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
  
  * Thu Jul 18 2013 Tim Waugh <twaugh at redhat.com> 9.07-11
  - Remove bundled (and unused) lcms source.
diff --cc sources
index 56ac832,4df8099..62c6218
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,4 @@@
  2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
  dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
- 7179bb1ed4f6f453147e6f7e1f210ce8  ghostscript-9.10.tar.bz2
+ b8756554357debc6b72b3d85674a4084  ghostscript-9.07-cleaned.tar.bz2
++2ace0c86929e79dc722ec6151de77db1  ghostscript-9.10-cleaned.tar.bz2