diff --git a/.cvsignore b/.cvsignore index a7577d1..7603857 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -poppler-data-0.2.1.tar.gz poppler-0.11.1.tar.gz diff --git a/poppler.spec b/poppler.spec index 512d235..bd9827b 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,4 +1,3 @@ -%define dataversion 0.2.1 Summary: PDF rendering library Name: poppler @@ -10,7 +9,6 @@ License: GPLv2 and Redistributable, no modification permitted Group: Development/Libraries URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz -Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz # for texlive/pdftex, TODO: upstream Patch0: poppler-ObjStream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -109,16 +107,15 @@ This utils package installs a number of command line tools for converting PDF files to a number of other formats. %prep -%setup -c -q -a1 -pushd %{name}-%{version} +%setup -q + %patch0 -p0 -b .objstream %patch50 -p1 -b .pkg_config # hammer to nuke rpaths, recheck on new releases autoreconf -i -f -popd + %build -pushd %{name}-%{version} # can use in a pinch, but isn't necessary (in general) -- Rex unset QTDIR && . /etc/profile.d/qt.sh %configure \ @@ -132,18 +129,11 @@ unset QTDIR && . /etc/profile.d/qt.sh --disable-zlib make %{?_smp_mflags} -popd -pushd poppler-data-%{dataversion} -cp COPYING COPYING-poppler-data -cp README README-poppler-data -popd %install rm -rf $RPM_BUILD_ROOT -make -C %{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install -make -C %{name}-data-%{dataversion} \ - DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} install +make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/lib*.la @@ -171,16 +161,11 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc %{name}-%{version}/README -%doc %{name}-%{version}/COPYING -%doc poppler-data-%{dataversion}/README-poppler-data -%doc poppler-data-%{dataversion}/COPYING-poppler-data +%doc COPYING README %{_libdir}/libpoppler.so.5* -%{_datadir}/poppler/ %files devel %defattr(-,root,root,-) -%exclude %{_libdir}/pkgconfig/poppler-qt.pc %{_libdir}/pkgconfig/poppler.pc %{_libdir}/pkgconfig/poppler-splash.pc %{_libdir}/libpoppler.so @@ -223,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 23 2009 Rex Dieter - 0.11.1-2 +- omit poppler-data (#507675) + * Tue Jun 23 2009 Rex Dieter - 0.11.1-1 - poppler-0.11.1 diff --git a/sources b/sources index 6e8536c..751b67a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -bca78b8786746c7b48b324283992d658 poppler-data-0.2.1.tar.gz 2c6aadf4c3c2d21da71239fa924db77d poppler-0.11.1.tar.gz