[libreoffice/f15] Resolves: rhbz#725133 backport tab/spaces fix

[Caolan McNamara]

commit bf4b606d3457f2c76b3b524e7c9274c6937f1354
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 25 11:20:05 2011 +0100

    Resolves: rhbz#725133 backport tab/spaces fix

 ...kefile-is-for-a-standard-Make-so-use-TABs.patch |   35 ++++++++++++++++++++
 libreoffice.spec                                   |    3 ++
 2 files changed, 38 insertions(+), 0 deletions(-)
---
diff --git a/0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch b/0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
new file mode 100644
index 0000000..06fa8c9
--- /dev/null
+++ b/0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
@@ -0,0 +1,35 @@
+From dd0c9fdc119a991b8f08070316e86d44afac478d Mon Sep 17 00:00:00 2001
+From: Tor Lillqvist <tlillqvist at novell.com>
+Date: Fri, 10 Jun 2011 15:35:08 +0300
+Subject: [PATCH] This makefile is for a standard Make, so use TABs (cherry
+ picked from commit
+ ff2c05d7b1411aeb67dc0ba415a1ec50db6331d6)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Caolán McNamara <caolanm at redhat.com>
+---
+ odk/settings/stdtarget.mk |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk
+index ba99722..938ab34 100644
+--- a/odk/settings/stdtarget.mk
++++ b/odk/settings/stdtarget.mk
+@@ -10,7 +10,8 @@ endif
+ install: $(REGISTERFLAG)
+ 
+ $(SDKTYPEFLAG):  #$(URE_TYPES) $(OFFICE_TYPES)
+-    -$(MKDIR) $(subst /,$(PS),$(@D))
+-    -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
+-    $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+-    echo flagged > $@
++# This is a makefile for a standard Make, so must be TABs below
++	-$(MKDIR) $(subst /,$(PS),$(@D))
++	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
++	$(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
++	echo flagged > $@
+-- 
+1.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 147be35..a355356 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -154,6 +154,7 @@ Patch65: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
 Patch66: 0001-fix-regression-in-SvGlobalName-operator.patch
 Patch67: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
 Patch68: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
+Patch69: 0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -823,6 +824,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch66 -p1 -b .fix-regression-in-SvGlobalName-operator.patch
 %patch67 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch
 %patch68 -p1 -b .rhbz725144-wrong-csh-syntax.patch
+%patch69 -p1 -b .0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2169,6 +2171,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Mon Jul 25 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-4-UNBUILT
 - Resolves: rhbz#725144 wrong csh syntax
+- Resolves: rhbz#725133 backport tab/spaces fix
 
 * Tue Jul 19 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-3
 - fix regression in SvGlobalName operator