From 20f80ddaf419051809d0b4e562a53dd5a42ab69c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 16 May 2006 11:16:40 +0000 Subject: [PATCH] - merged from HEAD Changed files: poppler.spec -> 1.23.4.3 --- poppler.spec | 122 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 114 insertions(+), 8 deletions(-) diff --git a/poppler.spec b/poppler.spec index 9d9c3ad..09d888c 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,33 +1,44 @@ -# +# FIXME: +# - qt4 causes main library to be linked with qt4 crap +# and this causes that kfile some.pdf crashes in qt4 code. +# qt4 disabled == kfile works nicely + # Conditional build: +%bcond_without apidocs # disable gtk-doc %bcond_without cairo # disable Cairo backend %bcond_without qt # disable qt wrapper +%bcond_with qt4 # disable qt4 wrapper # %define cairo_ver 1.0.0 # Summary: PDF rendering library Summary(pl): Biblioteka renderuj±ca PDF Name: poppler -Version: 0.4.5 -Release: 1 +Version: 0.5.1 +Release: 2 License: GPL Group: Libraries Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz -# Source0-md5: 2bb1c75aa3f9c42f0ba48b5492e6d32c +# Source0-md5: a136cd731892f4570933034ba97c8704 Patch0: %{name}-link.patch Patch1: %{name}-freetype_includes.patch +Patch2: %{name}-qt_m4.patch +Patch3: %{name}-gcc4.patch URL: http://poppler.freedesktop.org/ +%{?with_qt4:BuildRequires: QtGui-devel} BuildRequires: autoconf >= 2.59 BuildRequires: automake %{?with_cairo:BuildRequires: cairo-devel >= %{cairo_ver}} BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.0 BuildRequires: gtk+2-devel >= 2.0.0 +%{?with_apidocs:BuildRequires: gtk-doc >= 1.0} BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.5 BuildRequires: pkgconfig %{?with_qt:BuildRequires: qt-devel} %{?with_cairo:Requires: cairo >= %{cairo_ver}} +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -142,22 +153,89 @@ Static version of Qt wrapper for poppler. %description qt-static -l pl Statyczna wersja wrappera Qt dla popplera. +%package Qt +Summary: Qt4 wrapper for poppler +Summary(pl): Wrapper Qt4 dla popplera +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description Qt +Qt4 wrapper for poppler. + +%description Qt -l pl +Wrapper Qt4 dla popplera. + +%package Qt-devel +Summary: Header files for Qt4 wrapper for poppler +Summary(pl): Pliki nag³ówkowe wrappera Qt4 dla popplera +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-Qt = %{version}-%{release} +Requires: QtGui-devel + +%description Qt-devel +Header files for Qt4 wrapper for poppler. + +%description Qt-devel -l pl +Pliki nag³ówkowe wrapper Qt4 dla popplera. + +%package Qt-static +Summary: Static version of Qt4 wrapper for poppler +Summary(pl): Statyczna wersja wrappera Qt4 dla popplera +Group: Development/Libraries +Requires: %{name}-Qt-devel = %{version}-%{release} + +%description Qt-static +Static version of Qt4 wrapper for poppler. + +%description Qt-static -l pl +Statyczna wersja wrappera Qt4 dla popplera. + +%package progs +Summary: Set of tools for viewing information and converting PDF files +Summary(pl): Zestaw narzêdzi do wy¶wietlania informacji i konwertowania plików PDF +Group: Applications/Publishing +Provides: pdftops +Obsoletes: pdftohtml +Obsoletes: pdftohtml-pdftops +Obsoletes: xpdf-tools +Obsoletes: poppler-utils + +%description progs +Package contains utilites for PDF files. These utilities allow to +- extract information about PDF files +- extract images from PDF files +- convert PDF files to HTML, plain text and PS formats + +%description progs -l pl +Pakiet zawiera zestaw narzêdzi do plików PDF. Programy te umo¿liwiaj± +- wy¶wietlanie informacji o plikach PDF +- wydobywanie obrazków z plików PDF +- konwersjê plików PDF do formatów takich jak HTML, PS czy te¿ czystego + tekstu + %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__libtoolize} -%{__aclocal} -%{__autoconf} +%{__aclocal} -I m4 +%{__autoconf} -f %{__autoheader} %{__automake} %configure \ - QTLIB=%{_libdir} \ %{!?with_cairo:--disable-cairo-output} \ %{!?with_qt:--disable-poppler-qt} \ - --enable-a4-paper + %{!?with_qt4:--disable-poppler-qt4} \ + --enable-a4-paper \ + %{?with_apidocs:--enable-gtk-doc} \ + --enable-xpdf-headers \ + --enable-zlib \ + --with-html-dir=%{_gtkdocdir} %{__make} %install @@ -178,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT %post qt -p /sbin/ldconfig %postun qt -p /sbin/ldconfig +%post Qt -p /sbin/ldconfig +%postun Qt -p /sbin/ldconfig + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README* TODO @@ -190,10 +271,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/poppler %exclude %{_includedir}/poppler/glib %{?with_qt:%exclude %{_includedir}/poppler/poppler-qt.h} +%{?with_qt4:%exclude %{_includedir}/poppler/poppler-qt4.h} %{_pkgconfigdir}/poppler.pc %{?with_cairo:%{_pkgconfigdir}/poppler-cairo.pc} %{_pkgconfigdir}/poppler-splash.pc +%{_gtkdocdir}/poppler + %files static %defattr(644,root,root,755) %{_libdir}/libpoppler.a @@ -229,3 +313,25 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_libdir}/libpoppler-qt.a %endif + +%if %{with qt4} +%files Qt +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libpoppler-qt4.so.*.*.* + +%files Qt-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libpoppler-qt4.so +%{_libdir}/libpoppler-qt4.la +%{_includedir}/poppler/poppler-qt4.h +%{_pkgconfigdir}/poppler-qt4.pc + +%files Qt-static +%defattr(644,root,root,755) +%{_libdir}/libpoppler-qt4.a +%endif + +%files progs +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/pdf* +%{_mandir}/man1/pdf* -- 2.43.0