diff --git a/.gitignore b/.gitignore index edf12f9..c8ba188 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /Identity-UTF16-H /cmapresources_identity0.tar.z -/poppler-data-0.4.5.tar.gz -/poppler-data-0.4.6.tar.gz +/poppler-data-0.4.7.tar.gz diff --git a/poppler-data.spec b/poppler-data.spec index 26b08db..98e764a 100644 --- a/poppler-data.spec +++ b/poppler-data.spec @@ -5,32 +5,37 @@ Summary: Encoding files Name: poppler-data -Version: 0.4.6 -Release: 5%{?dist} +Version: 0.4.7 +Release: 1%{?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 License: BSD and GPLv2 -Group: Development/Libraries 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 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %if ! 0%{?gs_bootstrap:1} BuildRequires: ghostscript %endif %global gs_ver %(gs --version 2>/dev/null || echo %{gs_bootstrap}) +BuildRequires: pkgconfig %description 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 +%{summary}. + %prep %setup -q -a 1 @@ -39,12 +44,11 @@ properly. # intentionally left blank %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} +make install DESTDIR=%{buildroot} datadir=%{_datadir} # manually install Identity-* files # http://bugzilla.redhat.com/842351 -install -m644 -p %{SOURCE2} ai0/CMap/Identity-* $RPM_BUILD_ROOT%{_datadir}/poppler/cMap/ +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/ @@ -57,20 +61,21 @@ done popd -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%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/ +%files devel +%{_datadir}/pkgconfig/poppler-data.pc + %changelog +* Thu Aug 14 2014 Rex Dieter 0.4.7-1 +- 0.4.7, .spec cleanup + * Sat Jun 07 2014 Fedora Release Engineering - 0.4.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index da77623..8df5ccd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ eb715bce6ca0c60551d56e0573a40eb0 Identity-UTF16-H 83105c38e160c4bf51e21d20921760ac cmapresources_identity0.tar.z -a8a7ca808827dd674faba6e4fc73b471 poppler-data-0.4.6.tar.gz +636a8f2b9f6df9e7ced8ec0946961eaf poppler-data-0.4.7.tar.gz