[poppler] spin a more sane mocversiongrep.patch

[Rex Dieter]

commit ee654c598fc396df5f09809487e1a298dfe4fbe8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Oct 18 09:58:53 2013 -0500

    spin a more sane mocversiongrep.patch

 poppler-0.24.2-mocversiongrep.patch |   27 +++++----------------------
 1 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/poppler-0.24.2-mocversiongrep.patch b/poppler-0.24.2-mocversiongrep.patch
index 272116f..8325e3d 100644
--- a/poppler-0.24.2-mocversiongrep.patch
+++ b/poppler-0.24.2-mocversiongrep.patch
@@ -1,29 +1,12 @@
 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;
+--- 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
    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."`
++  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
@@ -31,14 +14,14 @@ diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
      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."`
++    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 2>1 | grep "5."`
++      mocversiongrep=`echo $mocversion | grep " 5\."`
        if test x"$mocversiongrep" != x"$mocversion"; then
          # no valid moc found
          enable_poppler_qt5=no;