[ghostscript: 4/4] Merge branch 'f14'

[Tim Waugh]

commit b161816eee868dc7548cf97533b1688e2a7fd8e8
Merge: 218fb19 d3ec0a6
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Oct 21 14:17:03 2010 +0100

    Merge branch 'f14'

 ghostscript.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc ghostscript.spec
index c3a9a02,f285016..00c21bb
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 5%{?dist}
 -Release: 20%{?dist}
++Release: 6%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -289,8 -356,12 +289,13 @@@ rm -rf $RPM_BUILD_ROO
  %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init
  %config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/gs_init.ps
  %config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/Fontmap*
+ %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/CMap
+ %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/ColorSpace
+ %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Decoding
+ %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Encoding
+ %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/SubstCID
  %{_datadir}/ghostscript/%{gs_dot_ver}/lib
 +%{_datadir}/ghostscript/%{gs_dot_ver}/iccprofiles
  %{_mandir}/man*/*
  %lang(de) %{_mandir}/de/man*/*
  %{_libdir}/libgs.so.*
@@@ -327,7 -398,12 +332,10 @@@
  %{_libdir}/libgs.so
  
  %changelog
 -* Thu Oct 21 2010 Tim Waugh <twaugh at redhat.com> 8.71-20
++* Thu Oct 21 2010 Tim Waugh <twaugh at redhat.com> 9.00-6
+ - Own more directories (bug #645075).
+ 
 -* Thu Oct 14 2010 Tim Waugh <twaugh at redhat.com> 8.71-19
 -- Apply some fixes from upstream to avoid gdevcups
 -  segfaults (bug #639593).
 +* Thu Oct 14 2010 Tim Waugh <twaugh at redhat.com> 9.00-5
  - gdevcups: don't use uninitialized variables in debugging output
    (Ghostscript bug #691683).