rpms/openoffice.org/devel openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch, NONE, 1.1 openoffice.org.spec, 1.169, 1.170 openoffice.org-1.9.97.oooXXXXX.checkzipresult.sc.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13879

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch 
Removed Files:
	openoffice.org-1.9.97.oooXXXXX.checkzipresult.sc.patch 
Log Message:
rename upstreamed patch

openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch:
 addin/util/makefile.mk    |    0 
 sc/addin/util/makefile.mk |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch ---
Index: addin/util/makefile.mk
===================================================================
RCS file: /cvs/sc/sc/addin/util/makefile.mk,v
retrieving revision 1.2
diff -u -p -r1.2 makefile.mk
--- openoffice.org.orig/sc/addin/util/makefile.mk	14 May 2002 11:13:21 -0000	1.2
+++ openoffice.org/sc/addin/util/makefile.mk	28 Apr 2005 11:38:30 -0000
@@ -73,11 +73,11 @@ $(BIN)$/addin.zip : \
 	$(MISC)$/rot.lst \
 	$(MISC)$/dfa.lst
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-	+$(TYPE) $(MISC)$/rot.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip 
-	+$(TYPE) $(MISC)$/dfa.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip 
+	+$(TYPE) $(MISC)$/rot.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip $(CHECKZIPRESULT)
+	+$(TYPE) $(MISC)$/dfa.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip $(CHECKZIPRESULT)
 	+chmod +rw $(BIN)$/addin.zip
 .ELSE
-	+$(TYPE) $< | zip -@ -u -j $(BIN)$/addin.zip
+	+$(TYPE) $< | zip -@ -u -j $(BIN)$/addin.zip $(CHECKZIPRESULT)
 .ENDIF
 
 ALL: \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- openoffice.org.spec	28 Apr 2005 11:33:05 -0000	1.169
+++ openoffice.org.spec	28 Apr 2005 11:46:51 -0000	1.170
@@ -83,7 +83,7 @@
 Patch32: openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch
 Patch33: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
 Patch34: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch35: openoffice.org-1.9.97.oooXXXXX.checkzipresult.sc.patch
+Patch35: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch
 Patch100: openoffice.org-1.9.97.rh156039.provides.patch
 
 %define __find_provides %{_tmppath}/find-provides.%{name}
@@ -673,7 +673,7 @@
 %patch32 -p1 -b .gcc21233.noquotesonjavaver.patch
 %patch33 -p1 -b .ooo35641.noxfonts.vcl.patch
 %patch34 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch35 -p1 -b .oooXXXXX.checkzipresult.sc.patch
+%patch35 -p1 -b .ooo48362.checkzipresult.sc.patch
 
 tar xzf %{SOURCE2}
 %build
@@ -2428,7 +2428,7 @@
 - rh#156065# use alternative gnome icons
 - add export SAL_ENABLE_FILE_LOCKING=1 for concurrent cppumakers collision
 experimentation
-- add openoffice.org-1.9.97.oooXXXXX.checkzipresult.sc.patch
+- add openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch
 
 * Tue Apr 26 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.96-2
 - just for havoc add openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch


--- openoffice.org-1.9.97.oooXXXXX.checkzipresult.sc.patch DELETED ---