From 8489a2268d859179a507500db4bea7e47d401dda Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Mon, 13 Nov 2017 14:13:58 +0100 Subject: [PATCH] specfile: ghostscript parts removed Ghostscript should take of its own encoding files from now on, so we don't need to rebuild poppler-date everytime ghostscript is rebased. --- poppler-data.spec | 30 ------------------------------ sources | 2 -- 2 files changed, 32 deletions(-) diff --git a/poppler-data.spec b/poppler-data.spec index 10d6772..6d4ab36 100644 --- a/poppler-data.spec +++ b/poppler-data.spec @@ -1,8 +1,3 @@ - -## to bootstrap and avoid the circular dependency with ghostscript -## define this to be the ghostscript version -#define gs_bootstrap 9.20 - Summary: Encoding files Name: poppler-data Version: 0.4.8 @@ -15,15 +10,7 @@ Release: 3%{?dist} License: BSD and GPLv2 and GPLv3+ URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-data-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/project/cmap.adobe/cmapresources_identity0.tar.z -# extracted from ghostscript-9.05 tarball -Source2: Identity-UTF16-H BuildArch: noarch - -%if ! 0%{?gs_bootstrap:1} -BuildRequires: ghostscript -%endif -%global gs_ver %(gs --version 2>/dev/null || echo %{gs_bootstrap}) BuildRequires: pkgconfig %description @@ -47,27 +34,10 @@ Requires: %{name} = %{version}-%{release} %install make install DESTDIR=%{buildroot} datadir=%{_datadir} -# manually install Identity-* files -# http://bugzilla.redhat.com/842351 -install -m644 -p %{SOURCE2} ai0/CMap/Identity-* %{buildroot}%{_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 - %files %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/ %files devel %{_datadir}/pkgconfig/poppler-data.pc diff --git a/sources b/sources index 29300cf..8d87e11 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (Identity-UTF16-H) = aa239b3a3f146703de382928993a9822d073686f3ed8be6fb8d216f9facf9e5ca5fbcf2981c07a7f282944b15f6c84154b62fc78641a48ec9cf0c6b690b80abf -SHA512 (cmapresources_identity0.tar.z) = 80b9791ee37f46ed94d207172392e07769f687964db3a28d27db6f8a1292bd351a2c38d908915b75bbafab977d7261964daf96abd09d5bd95f32449669ee8acd SHA512 (poppler-data-0.4.8.tar.gz) = c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54