packages: poppler/poppler.spec - really fixed libpoppler-qt linking - added...

[qboosh]

Author: qboosh                       Date: Sat Oct 23 19:39:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- really fixed libpoppler-qt linking
- added missing ldconfig for -cpp
- updated dependency versions

---- Files affected:
packages/poppler:
   poppler.spec (1.116 -> 1.117) 

---- Diffs:

================================================================
Index: packages/poppler/poppler.spec
diff -u packages/poppler/poppler.spec:1.116 packages/poppler/poppler.spec:1.117
--- packages/poppler/poppler.spec:1.116	Mon Oct 11 11:10:38 2010
+++ packages/poppler/poppler.spec	Sat Oct 23 21:39:22 2010
@@ -8,7 +8,7 @@
 %bcond_without	cpp	# disable cpp wrapper
 %bcond_without	glib	# disable glib wrapper
 #
-%define		cairo_ver	1.4.0
+%define		cairo_ver	1.8.4
 #
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
@@ -20,18 +20,19 @@
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
 # Source0-md5:	a40fe96e1115f648ce4689e667743530
 URL:		http://poppler.freedesktop.org/
-%{?with_qt4:BuildRequires:	QtGui-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	QtTest-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	QtXml-devel >= 4.1.0}
+%{?with_qt4:BuildRequires:	QtGui-devel >= 4.4.0}
+%{?with_qt4:BuildRequires:	QtTest-devel >= 4.4.0}
+%{?with_qt4:BuildRequires:	QtXml-devel >= 4.4.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	fontconfig-devel
+BuildRequires:	fontconfig-devel >= 2.0.0
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-devel
-%{?with_glib:BuildRequires:	glib2-devel >= 1:2.6.0}}
+%{?with_glib:BuildRequires:	glib2-devel >= 1:2.18.0}
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
+BuildRequires:	lcms-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
@@ -58,8 +59,9 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Poppler
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	fontconfig-devel
+Requires:	fontconfig-devel >= 2.0.0
 Requires:	freetype-devel >= 2.0
+Requires:	lcms-devel
 Requires:	libstdc++-devel
 Requires:	openjpeg-devel
 
@@ -136,7 +138,7 @@
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 %{?with_cairo:Requires:	cairo >= %{cairo_ver}}
-Requires:	glib2 >= 1:2.6.0
+Requires:	glib2 >= 1:2.18.0
 
 %description glib
 GLib wrapper for poppler.
@@ -151,7 +153,7 @@
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
 %{?with_cairo:Requires:	cairo-devel >= %{cairo_ver}}
-Requires:	glib2-devel >= 1:2.6.0
+Requires:	glib2-devel >= 1:2.18.0
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -214,6 +216,8 @@
 Summary(pl.UTF-8):	Wrapper Qt4 dla popplera
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	QtGui >= 4.4.0
+Requires:	QtXml >= 4.4.0
 
 %description Qt
 Qt4 wrapper for poppler.
@@ -227,8 +231,8 @@
 Group:		Development/Libraries
 Requires:	%{name}-Qt = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	QtGui-devel
-Requires:	QtXml-devel
+Requires:	QtGui-devel >= 4.4.0
+Requires:	QtXml-devel >= 4.4.0
 
 %description Qt-devel
 Header files for Qt4 wrapper for poppler.
@@ -274,8 +278,8 @@
 %prep
 %setup -q
 
-# fix link with Qt4 libraries
-%{__sed} -i 's,(POPPLER_QT_LIBS),(POPPLER_QT4_LIBS) -lqt-mt,' qt/Makefile.am
+# fix link with Qt 3 libraries
+%{__sed} -i 's,(POPPLER_QT_LIBS),(libqt3_LIBS),' qt/Makefile.am
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -293,6 +297,7 @@
 	%{!?with_qt4:--disable-poppler-qt4} \
 	%{!?with_cpp:--disable-poppler-cpp} \
 	%{!?with_glib:--disable-poppler-glib} \
+	--disable-silent-rules \
 	--enable-a4-paper \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
@@ -319,6 +324,9 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	cpp -p /sbin/ldconfig
+%postun	cpp -p /sbin/ldconfig
+
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
@@ -341,8 +349,8 @@
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
 %{_includedir}/poppler/[ABCDEFGJLMNOPRSTUX]*.h
-%{_includedir}/poppler/goo
 %{_includedir}/poppler/fofi
+%{_includedir}/poppler/goo
 %{_includedir}/poppler/splash
 %exclude %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler.pc
@@ -442,6 +450,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117  2010/10/23 19:39:22  qboosh
+- really fixed libpoppler-qt linking
+- added missing ldconfig for -cpp
+- updated dependency versions
+
 Revision 1.116  2010/10/11 09:10:38  lisu
 - up to 0.14.4
 - fix linking poppler-qt4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poppler/poppler.spec?r1=1.116&r2=1.117&f=u