[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/speed-soffice-sh.diff |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 7a7d46dbb42754dd2ff2fc5caee82b27884798c0
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Nov 13 15:24:18 2009 +0100

    Fix speed-soffice-sh.diff to generate all needed wrappers again
    
    * patches/dev300/speed-soffice-sh.diff: the original version of the diff caused
      that only soffice.sh was generated

diff --git a/patches/dev300/speed-soffice-sh.diff b/patches/dev300/speed-soffice-sh.diff
index 873a8f6..502a24b 100644
--- a/patches/dev300/speed-soffice-sh.diff
+++ b/patches/dev300/speed-soffice-sh.diff
@@ -1,22 +1,24 @@
-diff -u -r /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/makefile.mk desktop/scripts/makefile.mk
---- desktop/scripts/makefile.mk
-+++ desktop/scripts/makefile.mk
-@@ -54,7 +54,12 @@
+--- desktop/scripts/makefile.mk.orig	2009-11-05 16:00:58.000000000 +0100
++++ desktop/scripts/makefile.mk	2009-11-13 15:16:40.000000000 +0100
+@@ -53,8 +53,16 @@ UNIXTEXT= \
+     $(MISC)$/unoinfo.sh \
      $(MISC)$/unopkg.sh
  
- .IF "$(OS)" != "MACOSX"
+-.IF "$(OS)" != "MACOSX"
 -UNIXTEXT+= $(MISC)$/soffice.sh
++.IF "$(OS)" == "MACOSX"
++all: $(UNIXTEXT)
++.ELSE
++all: $(UNIXTEXT) $(MISC)$/soffice.sh
+ .ENDIF
+ 
+ .INCLUDE :  target.mk
++
 +$(MISC)$/soffice.sh : soffice.sh
 +	@echo "Building wrapper: " $@
 +	@@-$(RM) -f $@ $@.tmp
 +	@tr -d "\015" < $(@:f) > $@.tmp
 +	$(TYPE) $@.tmp | $(SED) "s/%%OS%%/$(OS)/" | $(SED) "s/%%CPUNAME%%/$(CPUNAME)/" > $@
- .ENDIF
- 
- .INCLUDE :  target.mk
-+
-
-
 diff -u -r /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/soffice.sh desktop/scripts/soffice.sh
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh