X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poppler.spec;h=b3a695d89b0e310c75794655de639dfcd47541d2;hb=a49cfbbaedc09dcc0ea8cd1e5124d37193f72ad8;hp=aa8ecbe0840d46e120f376ab4ea3016a83b099cf;hpb=fb47192394d224c4d578fec5092f13bdaa517fc1;p=packages%2Fpoppler0.61.git

diff --git a/poppler.spec b/poppler.spec
index aa8ecbe..b3a695d 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,9 +1,9 @@
+#%# $Revision: 1.131.2.4 $, $Date: 2011-09-16 10:21:03 $
 #
 # Conditional build:
 %bcond_without	apidocs # disable gtk-doc
 %bcond_without	cairo	# disable Cairo backend
 %bcond_without	qt	# disable qt wrapper
-%bcond_without	qt4	# disable qt4 wrapper
 %bcond_without	cpp	# disable cpp wrapper
 %bcond_without	glib	# disable glib wrapper
 #
@@ -12,16 +12,16 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.16.3
-Release:	2
+Version:	0.17.4
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	42227f1a1498089213a07533596b22f4
+# Source0-md5:	8cbdb1c2780ae70b9bec042c9f703c47
 URL:		http://poppler.freedesktop.org/
-%{?with_qt4:BuildRequires:	QtGui-devel >= 4.4.0}
-%{?with_qt4:BuildRequires:	QtTest-devel >= 4.4.0}
-%{?with_qt4:BuildRequires:	QtXml-devel >= 4.4.0}
+%{?with_qt:BuildRequires:	QtGui-devel >= 4.4.0}
+%{?with_qt:BuildRequires:	QtTest-devel >= 4.4.0}
+%{?with_qt:BuildRequires:	QtXml-devel >= 4.4.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
@@ -39,9 +39,7 @@ BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	openjpeg-devel
 BuildRequires:	pkgconfig >= 1:0.18
-%{?with_qt:BuildRequires:	qt-devel >= 3.0}
-%{?with_qt4:BuildRequires:	qt4-build}
-BuildRequires:	sed >= 4.0
+%{?with_qt:BuildRequires:	qt4-build}
 BuildRequires:	which
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -278,9 +276,6 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %prep
 %setup -q
 
-# fix link with Qt 3 libraries
-%{__sed} -i 's,(POPPLER_QT_LIBS),(libqt3_LIBS),' qt/Makefile.am
-
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
@@ -293,8 +288,7 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 	QTLIB=%{_libdir} \
 	--disable-gtk-test \
 	%{!?with_cairo:--disable-cairo-output} \
-	%{!?with_qt:--disable-poppler-qt} \
-	%{!?with_qt4:--disable-poppler-qt4} \
+	%{!?with_qt:--disable-poppler-qt4} \
 	%{!?with_cpp:--disable-poppler-cpp} \
 	%{!?with_glib:--disable-poppler-glib} \
 	--disable-silent-rules \
@@ -342,14 +336,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
 %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.13
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.17
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler.so
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
-%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUX]*.h
+%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUVX]*.h
 %{_includedir}/poppler/fofi
 %{_includedir}/poppler/goo
 %{_includedir}/poppler/splash
@@ -388,15 +382,15 @@ rm -rf $RPM_BUILD_ROOT
 %files glib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.6
-%{_libdir}/girepository-1.0/Poppler-0.16.typelib
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.8
+%{_libdir}/girepository-1.0/Poppler-0.18.typelib
 
 %files glib-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so
 %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler-glib.pc
-%{_datadir}/gir-1.0/Poppler-0.16.gir
+%{_datadir}/gir-1.0/Poppler-0.18.gir
 
 %files glib-static
 %defattr(644,root,root,755)
@@ -404,23 +398,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with qt}
-%files qt
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpoppler-qt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-qt.so.3
-
-%files qt-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpoppler-qt.so
-%{_includedir}/poppler/qt3
-%{_pkgconfigdir}/poppler-qt.pc
-
-%files qt-static
-%defattr(644,root,root,755)
-%{_libdir}/libpoppler-qt.a
-%endif
-
-%if %{with qt4}
 %files Qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-qt4.so.*.*.*