From a0979a8838d67aac988f5e6bc3d3c461e7b28f75 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: May 14 2014 17:49:43 +0000
Subject: Update to 0.26.0


---

diff --git a/.gitignore b/.gitignore
index f4788d6..54e7f89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /mingw-poppler.spec
 /poppler-0.24.4.tar.xz
 /poppler-0.24.5.tar.xz
+/poppler-0.26.0.tar.xz
diff --git a/mingw-poppler.spec b/mingw-poppler.spec
index bec85e0..392fc2b 100644
--- a/mingw-poppler.spec
+++ b/mingw-poppler.spec
@@ -3,18 +3,16 @@
 %global pkgname poppler
 
 Name:          mingw-%{pkgname}
-Version:       0.24.5
-Release:       2%{?dist}
+Version:       0.26.0
+Release:       1%{?dist}
 Summary:       MinGW Windows Poppler library
 Group:         Development/Libraries
 License:       (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 BuildArch:     noarch
 URL:           http://poppler.freedesktop.org/
 Source0:       http://poppler.freedesktop.org/%{pkgname}-%{version}.tar.xz
-# Fixes fragile test for Qt5 moc
-Patch0:        poppler_configureac-qt5.patch
 # Add Libs.private sections to pkg-config
-Patch1:        poppler_pkgconfig_private_libs.patch
+Patch0:        poppler_pkgconfig_private_libs.patch
 
 # Needed for Patch0
 BuildRequires: autoconf automake libtool
@@ -212,7 +210,6 @@ Static version of the MinGW Windows C++ Poppler library.
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 autoreconf -if
@@ -339,6 +336,9 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 
 
 %changelog
+* Wed May 14 2014 Sandro Mani <manisandro@gmail.com> - 0.26.0-1
+- Update to 0.26.0
+
 * Fri Apr 25 2014 Sandro Mani <manisandro@gmail.com> - 0.24.5-2
 - Add poppler_pkgconfig_private_libs.patch
 
diff --git a/poppler_configureac-qt5.patch b/poppler_configureac-qt5.patch
deleted file mode 100644
index df2e523..0000000
--- a/poppler_configureac-qt5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -rupN poppler-0.24.3/configure.ac poppler-0.24.3-new/configure.ac
---- poppler-0.24.3/configure.ac	2013-10-26 19:04:29.000000000 +0200
-+++ poppler-0.24.3-new/configure.ac	2013-10-28 18:08:33.782112652 +0100
-@@ -661,20 +661,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 "5\."`
-   if test x"$mocversiongrep" != x"$mocversion"; then
-     AC_MSG_RESULT([no])
-     # moc was not the qt5 one, try with moc-qt5
-     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 "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 "5\."`
-       if test x"$mocversiongrep" != x"$mocversion"; then
-         # no valid moc found
-         enable_poppler_qt5=no;
diff --git a/poppler_pkgconfig_private_libs.patch b/poppler_pkgconfig_private_libs.patch
index f25c50e..6e3df56 100644
--- a/poppler_pkgconfig_private_libs.patch
+++ b/poppler_pkgconfig_private_libs.patch
@@ -5,7 +5,7 @@ diff -rupN poppler-0.24.5/poppler-cpp.pc.in poppler-0.24.5-new/poppler-cpp.pc.in
  
  Libs: -L${libdir} -lpoppler-cpp
  Cflags: -I${includedir}/poppler/cpp
-+Libs.private: -liconv
++Libs.private: @LIBICONV@
 diff -rupN poppler-0.24.5/poppler.pc.in poppler-0.24.5-new/poppler.pc.in
 --- poppler-0.24.5/poppler.pc.in	2013-08-17 01:20:41.000000000 +0200
 +++ poppler-0.24.5-new/poppler.pc.in	2014-04-23 13:35:57.000000000 +0200
diff --git a/sources b/sources
index cc7306b..4cf0df9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-334f2ac95cc8039f2a57fe63e4a81c69  poppler-0.24.5.tar.xz
+76c3b2f18002a0f1e2bbbc7cccd1b957  poppler-0.26.0.tar.xz