[poppler] Update to 0.26.0

[mkasik]

commit 15f207a36f69e56b87df820601ab30ffa2305a4b
Author: Marek Kasik <mkasik at redhat.com>
Date:   Tue May 13 13:53:11 2014 +0200

    Update to 0.26.0

 .gitignore                          |    1 +
 poppler-0.24.2-mocversiongrep.patch |    8 ++++----
 poppler-0.24.3-segExtraBytes.patch  |   26 --------------------------
 poppler-0.26.0-multiple-defs.patch  |   27 +++++++++++++++++++++++++++
 poppler.spec                        |   13 ++++++++-----
 sources                             |    2 +-
 6 files changed, 41 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af55260..754f2e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /poppler-0.24.1.tar.xz
 /poppler-0.24.2.tar.xz
 /poppler-0.24.3.tar.xz
+/poppler-0.26.0.tar.xz
diff --git a/poppler-0.24.2-mocversiongrep.patch b/poppler-0.24.2-mocversiongrep.patch
index 8325e3d..e035841 100644
--- a/poppler-0.24.2-mocversiongrep.patch
+++ b/poppler-0.24.2-mocversiongrep.patch
@@ -1,11 +1,11 @@
 diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
 --- poppler-0.24.2/configure.ac.mocversiongrep	2013-10-18 09:51:24.223114884 -0500
 +++ poppler-0.24.2/configure.ac	2013-10-18 09:54:33.408681067 -0500
-@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the
+@@ -646,20 +646,20 @@ if test x$enable_poppler_qt5 = xyes; the
    AC_CHECK_TOOL(MOCQT5, moc)
    AC_MSG_CHECKING([for Qt5 moc])
    mocversion=`$MOCQT5 -v 2>&1`
--  mocversiongrep=`echo $mocversion | grep "Qt 5"`
+-  mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
 +  mocversiongrep=`echo $mocversion | grep " 5\."`
    if test x"$mocversiongrep" != x"$mocversion"; then
      AC_MSG_RESULT([no])
@@ -13,14 +13,14 @@ diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
      AC_CHECK_TOOL(MOCQT52, moc-qt5)
      AC_MSG_CHECKING([for Qt5 moc-qt5])
      mocversion=`$MOCQT52 -v 2>&1`
--    mocversiongrep=`echo $mocversion | grep "Qt 5"`
+-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
 +    mocversiongrep=`echo $mocversion | grep " 5\."`
      if test x"$mocversiongrep" != x"$mocversion"; then
        AC_CHECK_TOOL(QTCHOOSER, qtchooser)
        AC_MSG_CHECKING([for qtchooser])
        qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
        mocversion=`$qt5tooldir/moc -v 2>&1`
--      mocversiongrep=`echo $mocversion | grep "Qt 5"`
+-      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
 +      mocversiongrep=`echo $mocversion | grep " 5\."`
        if test x"$mocversiongrep" != x"$mocversion"; then
          # no valid moc found
diff --git a/poppler-0.26.0-multiple-defs.patch b/poppler-0.26.0-multiple-defs.patch
new file mode 100644
index 0000000..d759255
--- /dev/null
+++ b/poppler-0.26.0-multiple-defs.patch
@@ -0,0 +1,27 @@
+From c859d2b891a115c79d04db14463791dfb1c46a20 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at gnome.org>
+Date: Wed, 30 Apr 2014 09:25:31 +0200
+Subject: [PATCH] glib: Fix multiple definition of PopplerTextSpan
+
+https://bugs.freedesktop.org/show_bug.cgi?id=78103
+---
+ glib/poppler-structure-element.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/glib/poppler-structure-element.h b/glib/poppler-structure-element.h
+index 4596a41..3848c21 100644
+--- a/glib/poppler-structure-element.h
++++ b/glib/poppler-structure-element.h
+@@ -250,9 +250,6 @@ typedef enum {
+ } PopplerStructureTableScope;
+ 
+ 
+-typedef struct _PopplerTextSpan PopplerTextSpan;
+-
+-
+ GType                            poppler_structure_element_get_type               (void) G_GNUC_CONST;
+ PopplerStructureElementKind      poppler_structure_element_get_kind               (PopplerStructureElement     *poppler_structure_element);
+ gint                             poppler_structure_element_get_page               (PopplerStructureElement     *poppler_structure_element);
+-- 
+1.9.0
+
diff --git a/poppler.spec b/poppler.spec
index 9944591..f787e61 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,14 +1,14 @@
 
 Summary: PDF rendering library
 Name:    poppler
-Version: 0.24.3
-Release: 3%{?dist}
+Version: 0.26.0
+Release: 1%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 Group:   Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
 
-Patch0:  poppler-0.24.3-segExtraBytes.patch
+Patch0:  poppler-0.26.0-multiple-defs.patch
 
 ## upstreamable patches
 # fix configure checks for moc versions
@@ -146,8 +146,8 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 
 %prep
 %setup -q
+%patch0 -p1 -b .multiple-defs
 
-%patch0 -p1 -b .segExtraBytes
 %patch50 -p1 -b .mocversiongrep
 
 # hammer to nuke rpaths, recheck on new releases
@@ -213,7 +213,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/libpoppler.so.43*
+%{_libdir}/libpoppler.so.46*
 
 %files devel
 %defattr(-,root,root,-)
@@ -282,6 +282,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Tue May 13 2014 Marek Kasik <mkasik at redhat.com> - 0.26.0-1
+- Update to 0.26.0
+
 * Fri Jan  3 2014 Marek Kasik <mkasik at redhat.com> - 0.24.3-3
 - Use correct format string
 - Resolves: #1048202
diff --git a/sources b/sources
index 78d74ef..4cf0df9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31299f26a998029c85295dbbf4c30beb  poppler-0.24.3.tar.xz
+76c3b2f18002a0f1e2bbbc7cccd1b957  poppler-0.26.0.tar.xz