SPECS (AC-branch): poppler.spec - merged from HEAD

baggins baggins at pld-linux.org
Tue May 16 13:16:45 CEST 2006 

Author: baggins                      Date: Tue May 16 11:16:45 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   poppler.spec (1.23.4.2 -> 1.23.4.3) 

---- Diffs:

================================================================
Index: SPECS/poppler.spec
diff -u SPECS/poppler.spec:1.23.4.2 SPECS/poppler.spec:1.23.4.3
--- SPECS/poppler.spec:1.23.4.2	Fri Feb 17 21:19:28 2006
+++ SPECS/poppler.spec	Tue May 16 13:16:40 2006
@@ -1,34 +1,45 @@
 # $Revision$, $Date$
-#
+# 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
@@ -143,22 +154,89 @@
 %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
@@ -179,6 +257,9 @@
 %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
@@ -191,10 +272,13 @@
 %{_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
@@ -231,18 +315,84 @@
 %{_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*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.23.4.2  2006/02/17 20:19:28  psz
-- md5 fixed
+Revision 1.23.4.3  2006/05/16 11:16:40  baggins
+- merged from HEAD
+
+Revision 1.38  2006/04/03 18:21:58  arekm
+- rel 2; disable qt4 crap
+
+Revision 1.37  2006/03/01 18:40:41  pluto
+- ldconfig for Qt.
+
+Revision 1.36  2006/03/01 18:32:03  pluto
+- Qt4 wrapper packaged.
+
+Revision 1.35  2006/03/01 16:35:27  pluto
+- qt4 wrapper fixed and enabled but not packaged yet.
+   /usr/lib64/libpoppler-qt4.{a,la,so.*}
+   /usr/lib64/pkgconfig/poppler-qt4.pc
+
+Revision 1.34  2006/03/01 10:53:57  wrobell
+- ver. 0.5.1
+
+Revision 1.33  2006/02/25 13:54:14  freetz
+- enable zlib support
+
+Revision 1.32  2006/02/24 21:42:20  sparky
+- added cvs patch (there was some missing files), 0.5.0 is developement release anyway
+- rel 3
+
+Revision 1.31  2006/02/10 09:05:47  freetz
+- package xpdf headers too, rel.2
+
+Revision 1.30  2006/01/27 11:43:26  adgor
+- Apidocs bcond
+
+Revision 1.29  2006/01/23 15:31:05  wrobell
+- o: -utils
+
+Revision 1.28  2006/01/23 15:08:40  wrobell
+- s/poppler-utils/popplers-progs/ like in libxml2, libxslt...
+
+Revision 1.27  2006/01/23 12:38:22  wrobell
+- more descriptions
+
+Revision 1.26  2006/01/20 09:30:33  freetz
+- braindamage removed
+
+Revision 1.25  2006/01/20 09:27:17  freetz
+- note about qt dependency in utils subpkg
 
-Revision 1.23.4.1  2006/02/17 20:15:41  psz
-- up to 0.4.5 (security fix: CVE-2006-0301)
-- STBR
+Revision 1.24  2006/01/20 09:23:43  freetz
+- 0.5.0, utils subpkg, gtk-doc API docs
 
 Revision 1.23  2006/01/11 09:47:32  wrobell
 - ver. 0.4.4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.23.4.2&r2=1.23.4.3&f=u

More information about the pld-cvs-commit mailing list