diff --git a/poppler-data.spec b/poppler-data.spec index ba470d1..a95f5ad 100644 --- a/poppler-data.spec +++ b/poppler-data.spec @@ -1,8 +1,12 @@ +## to bootstrap and avoid the circular dependency with ghostscript +## define this to be the ghostscript version +#define gs_bootstrap 9.06 + Summary: Encoding files Name: poppler-data Version: 0.4.5 -Release: 5%{?dist} +Release: 6%{?dist} # The cMap data files installed by the poppler-data package are # under the COPYING.adobe license # cidToUnicode, nameToUnicode and unicodeMap data files @@ -17,8 +21,10 @@ Source2: Identity-UTF16-H BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -## first version to not include bundled poppler-data -#Conflicts: poppler < 0.11.0-5 +%if ! 0%{?gs_bootstrap:1} +BuildRequires: ghostscript +%endif +%global gs_ver %(gs --version 2>/dev/null || echo %{gs_bootstrap}) %description This package consists of encoding files for poppler. When installed, @@ -40,6 +46,16 @@ make install DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} # http://bugzilla.redhat.com/842351 install -m644 -p %{SOURCE2} ai0/CMap/Identity-* $RPM_BUILD_ROOT%{_datadir}/poppler/cMap/ +# create cmap symlinks for ghostscript +mkdir -p %{buildroot}%{_datadir}/ghostscript/%{gs_ver}/Resource/CMap/ +cmap_files=$(find %{buildroot}%{_datadir}/poppler/cMap/ -type f | sed -e "s|%{buildroot}%{_datadir}|../../../..|g") +pushd %{buildroot}%{_datadir}/ghostscript/%{gs_ver}/Resource/CMap/ +for target in ${cmap_files} ; do +ln -s $target +test -f $(basename $target) +done +popd + %clean rm -rf $RPM_BUILD_ROOT @@ -49,9 +65,15 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING COPYING.adobe COPYING.gpl2 README %{_datadir}/poppler/ +%dir %{_datadir}/ghostscript/%{gs_ver} +%dir %{_datadir}/ghostscript/%{gs_ver}/Resource +%{_datadir}/ghostscript/%{gs_ver}/Resource/CMap/ %changelog +* Tue Sep 18 2012 Rex Dieter 0.4.5-6 +- create ghostscript cmap symlinks (#842351) + * Sat Sep 15 2012 Rex Dieter 0.4.5-5 - Identity-UTF16-H too (#842351)