X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=poppler.spec;h=f31887376b432d9bcad788d26971df96e2e1a43c;hb=bf5184f72085ea8d6b7f3ac08e34d2244beeb5e7;hp=a91b6368b79e3f6012ec668d9a8aa12cbb5bfc94;hpb=6d515f804bda5e56edddde830661ce91b470531f;p=packages%2Fpoppler0.61.git

diff --git a/poppler.spec b/poppler.spec
index a91b636..f318873 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
+%bcond_without	apidocs # disable gtk-doc 
 %bcond_without	cairo	# disable Cairo backend
 %bcond_without	qt	# disable qt wrapper
 #
@@ -9,13 +10,14 @@ Summary:	PDF rendering library
 Summary(pl):	Biblioteka renderuj±ca PDF
 Name:		poppler
 Version:	0.5.0
-Release:	1
+Release:	3
 License:	GPL
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
 # Source0-md5:	c84c1be19f43e4a84872ff08234c1960
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-freetype_includes.patch
+Patch0:		%{name}-cvs.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-freetype_includes.patch
 URL:		http://poppler.freedesktop.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -23,12 +25,13 @@ BuildRequires:	automake
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gtk+2-devel >= 2.0.0
-BuildRequires:	gtk-doc >= 1.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
@@ -143,26 +146,34 @@ Static version of Qt wrapper for poppler.
 %description qt-static -l pl
 Statyczna wersja wrappera Qt dla popplera.
 
-%package utils
+%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
-Requires:	%{name}-qt-devel = %{version}-%{release}
 Provides:	pdftops
 Obsoletes:	pdftohtml
 Obsoletes:	pdftohtml-pdftops
 Obsoletes:	xpdf-tools
+Obsoletes:	poppler-utils
 
-%description utils
-Set of tools for viewing information and converting PDF files.
+%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 utils -l pl
-Zestaw narzêdzi do wy¶wietlania informacji i konwertowania plików PDF.
+%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
 
 %build
 %{__libtoolize}
@@ -175,7 +186,9 @@ Zestaw narz
 	%{!?with_cairo:--disable-cairo-output} \
 	%{!?with_qt:--disable-poppler-qt} \
 	--enable-a4-paper \
-	--enable-gtk-doc \
+	%{?with_apidocs:--enable-gtk-doc} \
+	--enable-xpdf-headers \
+	--enable-zlib \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -251,7 +264,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpoppler-qt.a
 %endif
 
-%files utils
+%files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pdf*
 %{_mandir}/man1/pdf*