X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poppler.spec;h=0a2babdbfb580abec03d3c2197600d8644654ae9;hb=b6482dda0ab744b5f479ce0d385d571ce27ee1ee;hp=6c0913d1fe039fd3cfda1882519bd3ad69a6a67f;hpb=649a1eb962e97facf23cbf5f85e29e386dfe6719;p=packages%2Fpoppler0.61.git

diff --git a/poppler.spec b/poppler.spec
index 6c0913d..0a2babd 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -3,25 +3,24 @@
 %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
 #
-%define		cairo_ver	1.8.4
+%define		cairo_ver	1.10.0
 #
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.15.1
+Version:	0.17.4
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	e198d5b4d2b1f0f75a81451b79b1e57e
+# 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}}
@@ -30,17 +29,16 @@ BuildRequires:	fontconfig-devel >= 2.0.0
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-devel
 %{?with_glib:BuildRequires:	glib2-devel >= 1:2.18.0}
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
+BuildRequires:	gobject-introspection-devel >= 0.6.7
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 BuildRequires:	lcms-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	openjpeg-devel
-BuildRequires:	pkgconfig
-%{?with_qt:BuildRequires:	qt-devel >= 3.0}
-%{?with_qt4:BuildRequires:	qt4-build}
-BuildRequires:	sed >= 4.0
+BuildRequires:	pkgconfig >= 1:0.18
+%{?with_qt:BuildRequires:	qt4-build}
 BuildRequires:	which
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -277,9 +275,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}
@@ -292,8 +287,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 \
@@ -314,9 +308,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{without apidocs}
 # why it still installs them, brr
-rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler
+%{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler || :
 %endif
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -339,19 +335,17 @@ 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.9
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.17
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler.so
-%{_libdir}/libpoppler.la
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
-%{_includedir}/poppler/[ABCDEFGJLMNOPRSTUX]*.h
+%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUVX]*.h
 %{_includedir}/poppler/fofi
 %{_includedir}/poppler/goo
 %{_includedir}/poppler/splash
-%exclude %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler.pc
 %{?with_cairo:%{_pkgconfigdir}/poppler-cairo.pc}
 %{_pkgconfigdir}/poppler-splash.pc
@@ -375,7 +369,6 @@ rm -rf $RPM_BUILD_ROOT
 %files cpp-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-cpp.so
-%{_libdir}/libpoppler-cpp.la
 %{_includedir}/poppler/cpp
 %{_pkgconfigdir}/poppler-cpp.pc
 
@@ -388,14 +381,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
+%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
-%{_libdir}/libpoppler-glib.la
 %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler-glib.pc
+%{_datadir}/gir-1.0/Poppler-0.18.gir
 
 %files glib-static
 %defattr(644,root,root,755)
@@ -403,24 +397,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.2
-
-%files qt-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpoppler-qt.so
-%{_libdir}/libpoppler-qt.la
-%{_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.*.*.*
@@ -429,7 +405,6 @@ rm -rf $RPM_BUILD_ROOT
 %files Qt-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-qt4.so
-%{_libdir}/libpoppler-qt4.la
 %{_includedir}/poppler/qt4
 %{_pkgconfigdir}/poppler-qt4.pc