[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, 1.2, 1.3



Author: caolanm

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

Modified Files:
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 
Log Message:
xmlsec patch update

openoffice.org-1.9.115.ooo51931.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.ooo51931.systemxmlsec.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.115.ooo51931.systemxmlsec.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.115.ooo51931.systemxmlsec.patch	15 Jul 2005 07:20:49 -0000	1.2
+++ openoffice.org-1.9.115.ooo51931.systemxmlsec.patch	15 Jul 2005 11:40:03 -0000	1.3
@@ -141,7 +141,7 @@
  CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
  .ENDIF
  
-+.IF "$(SYSTEM_XMLSEC)" != ""
++.IF "$(SYSTEM_XMLSEC)" == "YES"
 +PKGCONFIG_MODULES=xmlsec1
 +.INCLUDE: pkg_config.mk
 +.ENDIF
@@ -160,7 +160,7 @@
  	@echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
  .ENDIF
  
-+.IF "$(SYSTEM_XMLSEC)" != ""
++.IF "$(SYSTEM_XMLSEC)" == "YES"
 +PKGCONFIG_MODULES=xmlsec1
 +.INCLUDE: pkg_config.mk
 +CFLAGS+=-DSYSTEM_XMLSEC
@@ -173,7 +173,7 @@
  	$(SLO)$/seinitializer_nssimpl.obj \
  	$(SLO)$/xsec_nss.obj
  
-+.IF "$(SYSTEM_XMLSEC)" != ""
++.IF "$(SYSTEM_XMLSEC)" == "YES"
 +	SLOFILES+=\
 +	$(SLO)$/systemxmlsec.obj
 +.ENDIF


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]