SPECS: poppler.spec - qt4 wrapper fixed and enabled but not packag...

[pluto]

Author: pluto                        Date: Wed Mar  1 16:35:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- qt4 wrapper fixed and enabled but not packaged yet.
   /usr/lib64/libpoppler-qt4.{a,la,so.*}
   /usr/lib64/pkgconfig/poppler-qt4.pc

---- Files affected:
SPECS:
   poppler.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/poppler.spec
diff -u SPECS/poppler.spec:1.34 SPECS/poppler.spec:1.35
--- SPECS/poppler.spec:1.34	Wed Mar  1 11:53:57 2006
+++ SPECS/poppler.spec	Wed Mar  1 17:35:27 2006
@@ -4,6 +4,7 @@
 %bcond_without	apidocs # disable gtk-doc 
 %bcond_without	cairo	# disable Cairo backend
 %bcond_without	qt	# disable qt wrapper
+%bcond_without	qt4	# disable qt4 wrapper
 #
 %define		cairo_ver	1.0.0
 #
@@ -11,14 +12,17 @@
 Summary(pl):	Biblioteka renderująca PDF
 Name:		poppler
 Version:	0.5.1
-Release:	1
+Release:	1.1
 License:	GPL
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
 # 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}}
@@ -173,17 +177,19 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__autoconf}
+%{__autoconf} -f
 %{__autoheader}
 %{__automake}
 %configure \
-	QTLIB=%{_libdir} \
 	%{!?with_cairo:--disable-cairo-output} \
 	%{!?with_qt:--disable-poppler-qt} \
+	%{!?with_qt4:--disable-poppler-qt4} \
 	--enable-a4-paper \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
@@ -274,6 +280,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
================================================================

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