rpms/openoffice.org/devel openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.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-serv1056

Modified Files:
	openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch 
Log Message:
fix patch

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 +-
 openoffice.org/np_sdk/mozilla-source-M16-stub.patch          |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch	26 Jul 2005 11:55:13 -0000	1.1
+++ openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch	26 Jul 2005 12:26:51 -0000	1.2
@@ -1,26 +1,3 @@
---- openoffice.org.orig/config_office/configure.in.old	2005-06-09 14:11:54.000000000 +0200
-+++ openoffice.org/config_office/configure.in	2005-06-09 17:29:59.000000000 +0200
-@@ -2729,6 +2729,12 @@
-     SYSTEM_MOZILLA=YES
-     PKG_CHECK_MODULES( MOZILLAXPCOM, mozilla-xpcom )
- 
-+    if $PKG_CONFIG --exists nspr ; then
-+	PKG_CHECK_MODULES( MOZ_NSPR, nspr )
-+    else
-+	PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
-+    fi
-+
-     PKG_CHECK_MODULES( MOZ_NSS, mozilla-nss )
-     save_CPPFLAGS="$CPPFLAGS"
-     save_LDFLAGS="$LDFLAGS"
-@@ -2853,6 +2859,7 @@
- AC_SUBST(MOZ_INC)
- AC_SUBST(MOZ_LIB)
- AC_SUBST(MOZ_LIB_XPCOM)
-+AC_SUBST(MOZ_NSPR_CFLAGS)
- AC_SUBST(MOZ_NSS_CFLAGS)
- AC_SUBST(MOZ_LDAP_CFLAGS)
- AC_SUBST(MOZ_NSS_HACK)
 --- openoffice.org.orig/config_office/set_soenv.in.old	2005-06-09 14:11:54.000000000 +0200
 +++ openoffice.org/config_office/set_soenv.in	2005-06-09 17:31:05.000000000 +0200
 @@ -1692,6 +1692,7 @@
@@ -53,3 +30,31 @@
  ! .ENDIF
  ! 
  ! .IF "$(GUI)" == "UNX"
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.128
+diff -u -p -u -r1.128 configure.in
+--- openoffice.org.orig/config_office/configure.in	14 Jul 2005 13:45:35 -0000	1.128
++++ openoffice.org/config_office/configure.in	26 Jul 2005 12:25:50 -0000
+@@ -2709,6 +2709,12 @@ if test -n "$with_system_mozilla"; then
+ 
+     PKG_CHECK_MODULES( MOZILLAXPCOM, $moz_flavour-xpcom )
+ 
++    if $PKG_CONFIG --exists nspr ; then
++       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
++    else
++       PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
++    fi
++
+     PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss )
+     save_CPPFLAGS="$CPPFLAGS"
+     save_LDFLAGS="$LDFLAGS"
+@@ -2835,6 +2841,7 @@ AC_SUBST(SYSTEM_MOZILLA)
+ AC_SUBST(MOZ_INC)
+ AC_SUBST(MOZ_LIB)
+ AC_SUBST(MOZ_LIB_XPCOM)
++AC_SUBST(MOZ_NSPR_CFLAGS)
+ AC_SUBST(MOZ_NSS_CFLAGS)
+ AC_SUBST(MOZ_LDAP_CFLAGS)
+