diff --git a/.gitignore b/.gitignore index 520d862..c8ba188 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ /Identity-UTF16-H /cmapresources_identity0.tar.z /poppler-data-0.4.7.tar.gz -/poppler-data-0.4.8.tar.gz -/poppler-data-0.4.9.tar.gz -/poppler-data-0.4.11.tar.gz diff --git a/poppler-data.spec b/poppler-data.spec index db5d011..554fc13 100644 --- a/poppler-data.spec +++ b/poppler-data.spec @@ -1,176 +1,79 @@ -# ============================================================================= -Name: poppler-data -Summary: Encoding files for use with poppler -Version: 0.4.11 -Release: 10%{?dist} +## to bootstrap and avoid the circular dependency with ghostscript +## define this to be the ghostscript version +#define gs_bootstrap 9.06 -# NOTE: The licensing details are explained in COPYING file in source archive. -# Makefile is HPND-sell-variant but is not included in binary package -License: (GPL-2.0-only OR GPL-3.0-only) AND BSD-3-Clause +Summary: Encoding files +Name: poppler-data +Version: 0.4.7 +Release: 3%{?dist} +# The cMap data files installed by the poppler-data package are +# under the COPYING.adobe license +# cidToUnicode, nameToUnicode and unicodeMap data files +# are under the COPYING.gpl2 license +# Identity-UTF16-H is GPLv3+ (from GPL ghostscript) +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 -URL: https://poppler.freedesktop.org/ -Source: https://poppler.freedesktop.org/poppler-data-%{version}.tar.gz - -BuildArch: noarch -BuildRequires: make -BuildRequires: git - -# ============================================================================= - -# NOTE: 'autosetup' macro (below) uses 'git' for applying the patches: -# ->> All the patches should be provided in 'git format-patch' format. -# ->> Auxiliary repository will be created during 'fedpkg prep', you -# can see all the applied patches there via 'git log'. - -# Upstream patches -- official upstream patches released by upstream since the -# ---------------- last rebase that are necessary for any reason: -#Patch000: example000.patch - - -# Downstream patches -- these should be always included when doing rebase: -# ------------------ -#Patch100: example100.patch - - -# Downstream patches for RHEL -- patches that we keep only in RHEL for various -# --------------------------- reasons, but are not enabled in Fedora: -%if %{defined rhel} || %{defined centos} -#Patch200: example200.patch +%if ! 0%{?gs_bootstrap:1} +BuildRequires: ghostscript %endif - - -# Patches to be removed -- deprecated functionality which shall be removed at -# --------------------- some point in the future: - +%global gs_ver %(gs --version 2>/dev/null || echo %{gs_bootstrap}) +BuildRequires: pkgconfig %description -This package consists of encoding files for use with poppler. The encoding -files are optional and poppler will automatically read them if they are present. - -When installed, the encoding files enables poppler to correctly render both CJK -and Cyrrilic characters properly. - -# === SUBPACKAGES ============================================================= - -%package devel -Summary: Devel files for %{name} - -Requires: %{name} = %{version}-%{release} -BuildRequires: pkgconfig +This package consists of encoding files for poppler. When installed, +the encoding files enables poppler to correctly render CJK and Cyrillic +properly. +%package devel +Summary: Developer files for %{name} +Requires: %{name} = %{version}-%{release} %description devel -This sub-package currently contains only pkgconfig file, which can be used with -pkgconfig utility allowing your software to be build with poppler-data. +%{summary}. -# === BUILD INSTRUCTIONS ====================================================== %prep -%autosetup -S git +%setup -q -a 1 -# NOTE: Nothing to do here - we are packaging the content only. %build +# intentionally left blank %install -%make_install prefix=%{_prefix} +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 -# === PACKAGING INSTRUCTIONS ================================================== %files -%license COPYING COPYING.adobe COPYING.gpl2 +%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 -# ============================================================================= %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 0.4.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 0.4.11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 0.4.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.4.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.4.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 0.4.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 0.4.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.4.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 0.4.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Sep 10 2021 Rex Dieter - 0.4.11-1 -- 0.4.11 (#1890347) - -* Fri Jul 23 2021 Fedora Release Engineering - 0.4.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.4.9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.4.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 0.4.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 0.4.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 0.4.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Apr 25 2018 David Kaspar [Dee'Kej] - 0.4.9-1 -- rebase to latest upstream version (bug #1571487) - -* Fri Feb 09 2018 Fedora Release Engineering - 0.4.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Nov 15 2017 David Kaspar [Dee'Kej] - 0.4.8-4 -- specfile cleanup according to Fedora Packaging Guidelines -- ghostscript parts removed from specfile - -* Thu Nov 09 2017 David Kaspar [Dee'Kej] - 0.4.8-3 -- Rebuilt again (buildroot override was not yet in effect) - -* Thu Nov 09 2017 David Kaspar [Dee'Kej] - 0.4.8-2 -- Rebuilt because of ghostscript-9.22 rebase - -* Mon Aug 14 2017 Rex Dieter - 0.4.8-1 -- 0.4.8 (#1481056) - -* Thu Jul 27 2017 Fedora Release Engineering - 0.4.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.4.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 8 2016 David Kaspar [Dee'Kej] - 0.4.7-6 -- Rebuild because of ghostscript-9.20 rebase (bug #1402306) - -* Thu Feb 04 2016 Fedora Release Engineering - 0.4.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Rex Dieter 0.4.7-4 -- rebuild for ghostscript-9.16 (#1226627) - * Tue Feb 17 2015 Rex Dieter 0.4.7-3 - rebuild (ghostscript-9.15) diff --git a/sources b/sources index f70122d..8df5ccd 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (poppler-data-0.4.11.tar.gz) = a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32 +eb715bce6ca0c60551d56e0573a40eb0 Identity-UTF16-H +83105c38e160c4bf51e21d20921760ac cmapresources_identity0.tar.z +636a8f2b9f6df9e7ced8ec0946961eaf poppler-data-0.4.7.tar.gz