[libreoffice] fix configuration of harfbuzz

[David Tardon]

commit 75e5b87c7145ebbba07f2fd3db09a8fd4ebc6a7d
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 7 10:48:30 2013 +0200

    fix configuration of harfbuzz

 0001-simplify-check-for-harfbuzz.patch |   45 ++++++++++++++++++++++++++++++++
 libreoffice.spec                       |    2 +
 2 files changed, 47 insertions(+), 0 deletions(-)
---
diff --git a/0001-simplify-check-for-harfbuzz.patch b/0001-simplify-check-for-harfbuzz.patch
new file mode 100644
index 0000000..f958a1e
--- /dev/null
+++ b/0001-simplify-check-for-harfbuzz.patch
@@ -0,0 +1,45 @@
+From c20f79d8dabf1e7035ecad09dc46486412c1b332 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Fri, 7 Jun 2013 10:40:54 +0200
+Subject: [PATCH] simplify check for harfbuzz
+
+We check for it in both branches of the if, right? So why do not drop it
+entirely?
+
+(cherry picked from commit 36edf2e6fff430beeb35882b408ceb01453a9e18)
+
+Signed-off-by: David Tardon <dtardon at redhat.com>
+
+Conflicts:
+	configure.ac
+
+Change-Id: I715bfb55c02c5425bbb4874b97aca9d2872acced
+---
+ configure.ac | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6462857..8c7999d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8393,14 +8393,10 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
+ if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
+     AC_MSG_RESULT([yes])
+     ENABLE_HARFBUZZ="TRUE"
+-    if test "$with_system_harfbuzz" = "yes"; then
+-	if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+-		libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
+-    	else
+-    		libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
+-        fi
++    if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
++        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
+     else
+-    	libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
++        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
+     fi
+ else
+     AC_MSG_RESULT([no])
+-- 
+1.8.2.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index f56c0bf..23d27b1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -249,6 +249,7 @@ Patch16: 0001-do-not-build-LibreOffice_Test.patch
 Patch17: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
 Patch18: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
 Patch19: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
+Patch20: 0001-simplify-check-for-harfbuzz.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -987,6 +988,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch17 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch
 %patch18 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
 %patch19 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
+%patch20 -p1 -b .simplify-check-for-harfbuzz.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english