rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch, 1.5, 1.6

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6187

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
doubled patch

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |   20 +++++++++++++++-----
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 make.c           |   15 ++++++++++-----
 6 files changed, 45 insertions(+), 20 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 15:33:17 -0000	1.5
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	18 Aug 2009 08:40:20 -0000	1.6
@@ -211,17 +211,3 @@ diff -ru dmake.orig/path.c dmake/path.c
  	 p = n;
        }
        /* Look for an escape sequence and replace it by it's corresponding
---- dmake.orig/expand.c	2009-08-10 15:02:31.000000000 +0100
-+++ dmake/expand.c	2009-08-10 15:02:36.000000000 +0100
-@@ -727,8 +727,10 @@
- 	      done = !lev;
- 	      break;
-             } else {
-+	      size_t len;
- 	      s[1] = ' ';
--	      strcpy( s, s+1 );
-+	      len = strlen(s+1)+1;
-+	      memmove( s, s+1, len );
- 	    }
- 	    /*FALLTHRU*/
- 	 case ' ':