rpms/openoffice.org/devel openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch 
Log Message:
remove np_sdk from patches

openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch:
 config_office/configure.in                                   |    7 +++++++
 openoffice.org/config_office/set_soenv.in                    |    1 +
 openoffice.org/extensions/source/nsplugin/source/makefile.mk |    2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

Index: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch	26 Jul 2005 12:26:51 -0000	1.2
+++ openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch	23 Aug 2005 08:46:54 -0000	1.3
@@ -19,17 +19,6 @@
  # not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
  CFLAGS+=-DSYSTEM_MOZILLA -DMOZ_X11
  .ENDIF
---- openoffice.org.orig/np_sdk/mozilla-source-M16-stub.patch.old	2005-06-09 14:11:46.000000000 +0200
-+++ openoffice.org/np_sdk/mozilla-source-M16-stub.patch	2005-06-09 17:41:12.000000000 +0200
-@@ -1202,7 +1202,7 @@
- ! .ENDIF
- ! 
- ! .IF "$(SYSTEM_MOZILLA)" == "YES"
--! INCPRE= -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
-+! INCPRE= $(MOZ_NSPR_CFLAGS) -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
- ! .ENDIF
- ! 
- ! .IF "$(GUI)" == "UNX"
 Index: configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v