X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poppler.spec;h=982f12673029e0e783741dfba72c0222f67131bb;hb=6b0f61ded3324068de05b6d14fffb9b6f52d62a7;hp=d645af594b82f00457d3efdf6898922b9b9ba2c7;hpb=da3ca9ae123fcbcc13fbdd41e1f0e1a12dd7f770;p=packages%2Fpoppler0.61.git

diff --git a/poppler.spec b/poppler.spec
index d645af5..982f126 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -7,17 +7,17 @@
 %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.14.4
+Version:	0.16.5
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	a40fe96e1115f648ce4689e667743530
+# Source0-md5:	2b6e0c26b77a943df3b9bb02d67ca236
 URL:		http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:	QtGui-devel >= 4.4.0}
 %{?with_qt4:BuildRequires:	QtTest-devel >= 4.4.0}
@@ -30,14 +30,15 @@ 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
+BuildRequires:	pkgconfig >= 1:0.18
 %{?with_qt:BuildRequires:	qt-devel >= 3.0}
 %{?with_qt4:BuildRequires:	qt4-build}
 BuildRequires:	sed >= 4.0
@@ -297,12 +298,11 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 	%{!?with_cpp:--disable-poppler-cpp} \
 	%{!?with_glib:--disable-poppler-glib} \
 	--disable-silent-rules \
-	--enable-a4-paper \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
 	--enable-zlib \
 	--enable-dependency-tracking \
-	--with-html-dir=%{_gtkdocdir}
+	--with-html-dir=%{_gtkdocdir} 
 
 %{__make}
 
@@ -314,9 +314,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 +341,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.7
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.13
 
 %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/[ABCDEFGHJLMNOPRSTUX]*.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 +375,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 +387,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.5
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.6
+%{_libdir}/girepository-1.0/Poppler-0.16.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.16.gir
 
 %files glib-static
 %defattr(644,root,root,755)
@@ -406,12 +406,11 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%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
-%{_libdir}/libpoppler-qt.la
 %{_includedir}/poppler/qt3
 %{_pkgconfigdir}/poppler-qt.pc
 
@@ -429,7 +428,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