SPECS: poppler.spec - updated to 0.5.9 (devel, but fixes CVE-2007-...

[qboosh]

Author: qboosh                       Date: Sat Jun  2 16:35:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.5.9 (devel, but fixes CVE-2007-0104)
- updated qt_m4 patch, removed obsolete freetype_includes patch

---- Files affected:
SPECS:
   poppler.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/poppler.spec
diff -u SPECS/poppler.spec:1.45 SPECS/poppler.spec:1.46
--- SPECS/poppler.spec:1.45	Tue Feb 13 09:06:41 2007
+++ SPECS/poppler.spec	Sat Jun  2 18:35:28 2007
@@ -11,17 +11,17 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.5.4
+Version:	0.5.9
 Release:	1
 License:	GPL
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	053fdfd70533ecce1a06353fa945f061
-Patch0:		%{name}-freetype_includes.patch
-Patch1:		%{name}-qt_m4.patch
+# Source0-md5:	8d1ac008614c0e413bcac95b8102fa07
+Patch0:		%{name}-qt_m4.patch
 URL:		http://poppler.freedesktop.org/
-%{?with_qt4:BuildRequires:	QtGui-devel}
-%{?with_qt4:BuildRequires:	QtXml-devel}
+%{?with_qt4:BuildRequires:	QtGui-devel >= 4.1.0}
+%{?with_qt4:BuildRequires:	QtXml-devel >= 4.1.0}
+%{?with_qt4:BuildRequires:	QtTest-devel >= 4.1.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
@@ -29,10 +29,12 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gtk+2-devel >= 2:2.8.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
+BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
-%{?with_qt:BuildRequires:	qt-devel}
+%{?with_qt:BuildRequires:	qt-devel >= 3.0}
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -215,7 +217,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -265,13 +266,13 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler.so
 %{_libdir}/libpoppler.la
-%{_includedir}/poppler
+%dir %{_includedir}/poppler
+%{_includedir}/poppler/poppler-config.h
+%{_includedir}/poppler/[ABCDEFGJLNOPSTUX]*.h
+%{_includedir}/poppler/Function.cc
+%{_includedir}/poppler/goo
+%{_includedir}/poppler/splash
 %exclude %{_includedir}/poppler/glib
-# %{_includedir}/poppler/poppler-page-transition.h is shared between qt and qt4
-%{?with_qt:%exclude %{_includedir}/poppler/poppler-qt.h}
-%{?with_qt4:%exclude %{_includedir}/poppler/poppler-annotation.h}
-%{?with_qt4:%exclude %{_includedir}/poppler/poppler-link.h}
-%{?with_qt4:%exclude %{_includedir}/poppler/poppler-qt4.h}
 %{_pkgconfigdir}/poppler.pc
 %{?with_cairo:%{_pkgconfigdir}/poppler-cairo.pc}
 %{_pkgconfigdir}/poppler-splash.pc
@@ -306,7 +307,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-qt.so
 %{_libdir}/libpoppler-qt.la
-%{_includedir}/poppler/poppler-qt.h
+%{_includedir}/poppler/qt3
 %{_pkgconfigdir}/poppler-qt.pc
 
 %files qt-static
@@ -323,9 +324,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-qt4.so
 %{_libdir}/libpoppler-qt4.la
-%{_includedir}/poppler/poppler-annotation.h
-%{_includedir}/poppler/poppler-link.h
-%{_includedir}/poppler/poppler-qt4.h
+%{_includedir}/poppler/qt4
 %{_pkgconfigdir}/poppler-qt4.pc
 
 %files Qt-static
@@ -344,6 +343,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007/06/02 16:35:28  qboosh
+- updated to 0.5.9 (devel, but fixes CVE-2007-0104)
+- updated qt_m4 patch, removed obsolete freetype_includes patch
+
 Revision 1.45  2007/02/13 08:06:41  glen
 - tabs in preamble
 
================================================================

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