Use poppler-data for CMaps (bug #630632).

This commit is contained in:
Tim Waugh 2011-01-28 16:41:01 +00:00
parent 12643a2fd3
commit 135b241fd4

View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
Release: 11%{?dist}
Release: 12%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@ -34,6 +34,7 @@ Patch30: ghostscript-icc-fix.patch
Patch31: ghostscript-gdevcups-691733.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
Requires: poppler-data
BuildRequires: xz
BuildRequires: libjpeg-devel, libXt-devel
BuildRequires: zlib-devel, libpng-devel, unzip, gtk2-devel
@ -44,6 +45,7 @@ BuildRequires: libtiff-devel
BuildRequires: cups-devel >= 1.1.13
BuildRequires: libtool
BuildRequires: jasper-devel
BuildRequires: poppler-data
%{?_with_freetype:BuildRequires: freetype-devel}
BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
@ -185,7 +187,8 @@ for path in \
%{_datadir}/fonts \
%{_datadir}/%{name}/conf.d \
%{_sysconfdir}/%{name} \
%{_sysconfdir}/%{name}/%{gs_dot_ver}
%{_sysconfdir}/%{name}/%{gs_dot_ver} \
%{_datadir}/poppler/cMap/*
do
FONTPATH="$FONTPATH${FONTPATH:+:}$path"
done
@ -278,6 +281,9 @@ find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
# Don't ship fixmswrd.pl as it pulls in perl (bug #463948).
rm -f $RPM_BUILD_ROOT%{_bindir}/fixmswrd.pl
# Don't ship CMaps (instead poppler-data paths are in search path).
rm -f $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/CMap/*
MAIN_PWD=`pwd`
(cd $RPM_BUILD_ROOT; find .%{_datadir}/ghostscript/%{gs_dot_ver}/Resource -type f | \
sed -e 's/\.//;' | grep -v Fontmap | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
@ -344,6 +350,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
* Fri Jan 28 2011 Tim Waugh <twaugh@redhat.com> 9.00-12
- Use poppler-data for CMaps (bug #630632).
* Mon Jan 17 2011 Tim Waugh <twaugh@redhat.com> 9.00-11
- Fixed macro in comment.
- Include full source URL.