From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 6 Jan 2013 09:36:38 +0000 (+0100)
Subject: - updated to 0.22.0 (note: new libpoppler soname)
X-Git-Tag: auto/th/poppler0.61-0.61.0-1~45
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fpoppler0.61.git;a=commitdiff_plain;h=5ee7d9e8684869029a3823b0a06c357a5b92f021

- updated to 0.22.0 (note: new libpoppler soname)
- added am patch (fixes build with automake 1.13)
---

diff --git a/poppler-am.patch b/poppler-am.patch
new file mode 100644
index 0000000..c076ded
--- /dev/null
+++ b/poppler-am.patch
@@ -0,0 +1,13 @@
+--- poppler-0.22.0/configure.ac.orig	2012-12-29 19:45:50.000000000 +0100
++++ poppler-0.22.0/configure.ac	2013-01-06 09:10:49.668390912 +0100
+@@ -8,8 +8,8 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
+-AM_CONFIG_HEADER(poppler/poppler-config.h)
++AC_CONFIG_HEADERS(config.h)
++AC_CONFIG_HEADERS(poppler/poppler-config.h)
+ AC_C_BIGENDIAN
+ 
+ dnl ##### Initialize libtool.
diff --git a/poppler.spec b/poppler.spec
index 3b1cff1..019c30d 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -11,12 +11,13 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.20.4
+Version:	0.22.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	ce9486ab05254af922650be64c943487
+# Source0-md5:	c7038be37a7d446544e83a7df3c26196
+Patch0:		%{name}-am.patch
 URL:		http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:	QtGui-devel >= 4.4.0}
 %{?with_qt4:BuildRequires:	QtTest-devel >= 4.4.0}
@@ -39,12 +40,17 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
-BuildRequires:	openjpeg-devel
+BuildRequires:	openjpeg-devel >= 1.5
 BuildRequires:	pkgconfig >= 1:0.18
+# wanted cairo backends
+BuildRequires:	pkgconfig(cairo-pdf) >= %{cairo_ver}
+BuildRequires:	pkgconfig(cairo-ps) >= %{cairo_ver}
+BuildRequires:	pkgconfig(cairo-svg) >= %{cairo_ver}
 %{?with_qt4:BuildRequires:	qt4-build}
 BuildRequires:	sed >= 4.0
 BuildRequires:	which
 BuildRequires:	zlib-devel
+Requires:	openjpeg >= 1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,7 +74,7 @@ Requires:	libjpeg-devel
 Requires:	libpng-devel
 Requires:	libstdc++-devel
 Requires:	libtiff-devel
-Requires:	openjpeg-devel
+Requires:	openjpeg-devel >= 1.5
 Requires:	zlib-devel
 
 %description devel
@@ -248,6 +254,7 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -305,7 +312,7 @@ 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.28
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.34
 
 %files devel
 %defattr(644,root,root,755)