rpms/openoffice.org/devel openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch, NONE, 1.1 openoffice.org.spec, 1.264, 1.265

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jul 1 08:23:32 UTC 2005


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch 
Log Message:
cvs -kk tags confused np_sdk patch

openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch:
 mozilla-source-M16-stub.patch |   16 ----------------
 1 files changed, 16 deletions(-)

--- NEW FILE openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch ---
Index: mozilla-source-M16-stub.patch
===================================================================
RCS file: /cvs/external/np_sdk/mozilla-source-M16-stub.patch,v
retrieving revision 1.3
diff -u -p -r1.3 mozilla-source-M16-stub.patch
--- openoffice.org.orig/np_sdk/mozilla-source-M16-stub.patch	30 Mar 2005 11:38:42 -0000	1.3
+++ openoffice.org/np_sdk/mozilla-source-M16-stub.patch	1 Jul 2005 08:21:03 -0000
@@ -173,23 +173,6 @@
 *** misc/mozilla/include/npupp.h	Sat Nov  6 04:22:23 1999
 --- misc/build/mozilla/include/npupp.h	Tue Mar 19 19:32:49 2002
 ***************
-*** 22,28 ****
-  
-  
-  /*
-!  *  npupp.h $Revision$
-   *  function call mecahnics needed by platform specific glue code.
-   */
-  
---- 22,28 ----
-  
-  
-  /*
-!  *  npupp.h $Revision$
-   *  function call mecahnics needed by platform specific glue code.
-   */
-  
-***************
 *** 72,82 ****
   		
   #else


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- openoffice.org.spec	30 Jun 2005 10:20:50 -0000	1.264
+++ openoffice.org.spec	1 Jul 2005 08:23:30 -0000	1.265
@@ -106,6 +106,7 @@
 Patch43: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
 Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
 Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -730,6 +731,7 @@
 %patch43 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
 %patch44 -p1 -b .oooXXXXX.testtools.patch
 %patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped




More information about the fedora-cvs-commits mailing list