[poppler] 0.24.2-4

[Rex Dieter]

commit 34156e252b6d80e3b97d728a2a831417583a4a4a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Oct 18 09:23:22 2013 -0500

    0.24.2-4
    
    - fix mocversiongrep configure checks (so Qt 5.2 works)
    - %configure --disable-silent-rules

 poppler-0.24.2-mocversiongrep.patch |   44 +++++++++++++++++++++++++++++++++++
 poppler.spec                        |   13 +++++++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/poppler-0.24.2-mocversiongrep.patch b/poppler-0.24.2-mocversiongrep.patch
new file mode 100644
index 0000000..272116f
--- /dev/null
+++ b/poppler-0.24.2-mocversiongrep.patch
@@ -0,0 +1,44 @@
+diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
+--- poppler-0.24.2/configure.ac.mocversiongrep	2013-09-27 05:40:27.000000000 -0500
++++ poppler-0.24.2/configure.ac	2013-10-18 09:18:29.617963650 -0500
+@@ -604,14 +604,14 @@ if test x$enable_poppler_qt4 = xyes; the
+   AC_CHECK_TOOL(MOCQT4, moc)
+   AC_MSG_CHECKING([for Qt4 moc])
+   mocversion=`$MOCQT4 -v 2>&1`
+-  mocversiongrep=`echo $mocversion | grep "Qt 4"`
++  mocversiongrep=`echo $mocversion 2>1 | grep "Qt 4"`
+   if test x"$mocversiongrep" != x"$mocversion"; then
+     AC_MSG_RESULT([no])
+     # moc was not the qt4 one, try with moc-qt4
+     AC_CHECK_TOOL(MOCQT42, moc-qt4)
+     AC_MSG_CHECKING([for Qt4 moc-qt4])
+     mocversion=`$MOCQT42 -v 2>&1`
+-    mocversiongrep=`echo $mocversion | grep "Qt 4"`
++    mocversiongrep=`echo $mocversion 2>1 | grep "Qt 4"`
+     if test x"$mocversiongrep" != x"$mocversion"; then
+       # no valid moc found
+       enable_poppler_qt4=no;
+@@ -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 2>1 | 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 2>1 | 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 2>1 | grep "5."`
+       if test x"$mocversiongrep" != x"$mocversion"; then
+         # no valid moc found
+         enable_poppler_qt5=no;
diff --git a/poppler.spec b/poppler.spec
index 63c25b6..b003696 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,12 +2,16 @@
 Summary: PDF rendering library
 Name:    poppler
 Version: 0.24.2
-Release: 3%{?dist}
+Release: 4%{?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
 
+## upstreamable patches
+# fix configure checks for moc versions
+Patch50: poppler-0.24.2-mocversiongrep.patch
+
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
 BuildRequires: gettext-devel
@@ -141,6 +145,8 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 %prep
 %setup -q
 
+%patch50 -p1 -b .mocversiongrep
+
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 
@@ -148,6 +154,7 @@ autoreconf -i -f
 %build
 
 %configure \
+  --disable-silent-rules \
   --disable-static \
   --enable-cairo-output \
   --enable-libjpeg \
@@ -272,6 +279,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Fri Oct 18 2013 Rex Dieter <rdieter at fedoraproject.org> - 0.24.2-4
+- fix mocversiongrep configure checks (so Qt 5.2 works)
+- %%configure --disable-silent-rules
+
 * Fri Oct 18 2013 Rex Dieter <rdieter at fedoraproject.org> 0.24.2-3
 - undo ExcludeArch: ppc ppc64 (qt5-qtbase-5.1.1-6+ fixed)