freeciv/fix-qt5-detection.patch

--- m4/qt5.m4.orig	2015-03-16 15:29:47.800729769 +0100
+++ m4/qt5.m4	2015-03-16 15:41:35.044747937 +0100
@@ -114,8 +114,8 @@
 
 dnl If $1 is Qt 5's moc command then $2 else $3
 AC_DEFUN([FC_QT5_IF_QT5_MOC],
-  AS_IF([test "`$1 -v 2<&1 | grep -o 'Qt [[[0-9]]]\+'`" = "Qt 5" ||
-         test "`$1 -v 2<&1 | grep -o 'moc [[[0-9]]]\+'`" = "moc 5" ],
+  AS_IF([test "`$1 -v 2<&1 | grep -o 'Qt 5\+'`" = "Qt 5" ||
+         test "`$1 -v 2<&1 | grep -o $1' 5\+'`" = "$1 5" ],
     [$2], [$3]))
 
 dnl Set MOCCMD to $1 if it is the Qt 5 "moc". If not run $2 parameter.
Accepting request 291034 from home:adrianSuSE:branches:games - update to version 2.5.0 - switch to non-ancient UI libs (qt and gtk3) => two extra subpackages to have the choice - fix moc-qt5 detection OBS-URL: https://build.opensuse.org/request/show/291034 OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=29 2015-03-16 16:18:52 +00:00			`--- m4/qt5.m4.orig 2015-03-16 15:29:47.800729769 +0100`
			`+++ m4/qt5.m4 2015-03-16 15:41:35.044747937 +0100`
			`@@ -114,8 +114,8 @@`

			`dnl If $1 is Qt 5's moc command then $2 else $3`
			`AC_DEFUN([FC_QT5_IF_QT5_MOC],`
			- AS_IF([test "`$1 -v 2<&1 \| grep -o 'Qt [[[0-9]]]\+'`" = "Qt 5" \|\|
			- test "`$1 -v 2<&1 \| grep -o 'moc [[[0-9]]]\+'`" = "moc 5" ],
			+ AS_IF([test "`$1 -v 2<&1 \| grep -o 'Qt 5\+'`" = "Qt 5" \|\|
			+ test "`$1 -v 2<&1 \| grep -o $1' 5\+'`" = "$1 5" ],
			`[$2], [$3]))`

			`dnl Set MOCCMD to $1 if it is the Qt 5 "moc". If not run $2 parameter.`