rpms/openoffice.org/devel openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch, 1.1, 1.2

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch 
Log Message:
I cut too deep

openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch:
 config_office/configure.in                                    |   22 
 config_office/set_soenv.in                                    |    1 
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.cxx | 1836 ++++++++++
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.hxx |  238 +
 scp2/source/ooo/file_library_ooo.scp                          |    2 
 scp2/source/ooo/makefile.mk                                   |    4 
 scp2/source/ooo/shortcut_ooo.scp                              |    2 
 source/ooo/file_library_ooo.scp                               |    0 
 source/ooo/makefile.mk                                        |    0 
 source/ooo/shortcut_ooo.scp                                   |    0 
 source/xmlsec/makefile.mk                                     |    0 
 source/xmlsec/nss/makefile.mk                                 |    0 
 source/xmlsec/nss/securityenvironment_nssimpl.cxx             |    0 
 xmlsecurity/source/xmlsec/makefile.mk                         |    5 
 xmlsecurity/source/xmlsec/nss/makefile.mk                     |   10 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    4 
 16 files changed, 2122 insertions(+), 2 deletions(-)

Index: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch	8 Jul 2005 15:57:51 -0000	1.1
+++ openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch	8 Jul 2005 20:31:43 -0000	1.2
@@ -72,24 +72,8 @@
 retrieving revision 1.107
 diff -u -p -r1.107 file_library_ooo.scp
 --- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	17 Jun 2005 09:33:15 -0000	1.107
-+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	8 Jul 2005 10:51:20 -0000
-@@ -2160,6 +2160,7 @@ SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMed
- #endif
- 
- #ifndef WITHOUT_MOZILLA
-+#ifndef SYSTEM_XMLSEC
- File gid_File_Lib_XSec_Framework
-     TXT_FILE_BODY;
- 	#ifdef UNX
-@@ -2183,6 +2184,7 @@ File gid_File_Lib_XSec_XmlSec
-     Styles = (PACKED,UNO_COMPONENT);
-     RegistryID = gid_Starregistry_Services_Rdb;
- End
-+#endif
- 
- File gid_File_Lib_XSec_XMLSecurity
-     TXT_FILE_BODY;
-@@ -2196,6 +2198,7 @@ File gid_File_Lib_XSec_XMLSecurity
++++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	8 Jul 2005 20:34:24 -0000
+@@ -2196,6 +2196,7 @@ File gid_File_Lib_XSec_XMLSecurity
      RegistryID = gid_Starregistry_Services_Rdb;
  End
  
@@ -97,7 +81,7 @@
  File gid_File_Lib_LibXMLSec_xmlseccore
      TXT_FILE_BODY;
      #ifdef UNX
-@@ -2232,6 +2235,7 @@ File gid_File_Lib_LibXMLSec_xmlsecnss
+@@ -2232,6 +2233,7 @@ File gid_File_Lib_LibXMLSec_xmlsecnss
      Styles = (PACKED);
  End
  #endif
@@ -111,7 +95,7 @@
 retrieving revision 1.33
 diff -u -p -r1.33 makefile.mk
 --- openoffice.org.orig/scp2/source/ooo/makefile.mk	17 Jun 2005 14:14:51 -0000	1.33
-+++ openoffice.org/scp2/source/ooo/makefile.mk	8 Jul 2005 10:51:21 -0000
++++ openoffice.org/scp2/source/ooo/makefile.mk	8 Jul 2005 20:34:25 -0000
 @@ -158,6 +158,10 @@ SCPDEFS+=-DSYSTEM_PORTAUDIO
  SCPDEFS+=-DSYSTEM_MYSPELL
  .ENDIF
@@ -129,7 +113,7 @@
 retrieving revision 1.18
 diff -u -p -r1.18 shortcut_ooo.scp
 --- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp	15 Jun 2005 10:27:53 -0000	1.18
-+++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp	8 Jul 2005 10:51:22 -0000
++++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp	8 Jul 2005 20:34:26 -0000
 @@ -447,6 +447,7 @@ End
  
  //i38417