rpms/xulrunner/F-10 mozilla-build.patch,1.1,1.2

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17808

Modified Files:
	mozilla-build.patch 
Log Message:
Fix patch

mozilla-build.patch:
 Makefile.in         |    1 -
 ssl/src/Makefile.in |    2 --
 2 files changed, 3 deletions(-)

Index: mozilla-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/mozilla-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mozilla-build.patch	6 Nov 2007 10:12:06 -0000	1.1
+++ mozilla-build.patch	27 Oct 2009 08:01:40 -0000	1.2
@@ -1,18 +1,33 @@
-diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
---- mozilla/security/manager/Makefile.in.old	2007-10-25 00:25:30.000000000 +0200
-+++ mozilla/security/manager/Makefile.in	2007-11-06 10:57:39.000000000 +0100
-@@ -150,7 +150,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+diff -upU8 mozilla/security/manager/Makefile.in.mozilla-build mozilla/security/manager/Makefile.in
+--- mozilla/security/manager/Makefile.in.mozilla-build	2009-10-07 14:39:15.000000000 +0200
++++ mozilla/security/manager/Makefile.in	2009-10-07 14:39:54.000000000 +0200
+@@ -174,17 +174,16 @@ endif
+ DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+ DEFAULT_GMAKE_FLAGS += CC="$(CC)"
+ DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
+ DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
+ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR)
  DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
  DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
  DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 -DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
+ DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)"
  ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
  ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
  DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
-diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
---- mozilla/security/manager/ssl/src/Makefile.in.old	2007-10-19 21:16:36.000000000 +0200
-+++ mozilla/security/manager/ssl/src/Makefile.in	2007-11-06 10:57:52.000000000 +0100
-@@ -134,8 +134,6 @@ REQUIRES	= nspr \
+ endif
+ ifndef MOZ_DEBUG
+ DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 OPT_CODE_SIZE=1
+ endif
+diff -upU8 mozilla/security/manager/ssl/src/Makefile.in.mozilla-build mozilla/security/manager/ssl/src/Makefile.in
+--- mozilla/security/manager/ssl/src/Makefile.in.mozilla-build	2009-10-07 14:39:39.000000000 +0200
++++ mozilla/security/manager/ssl/src/Makefile.in	2009-10-07 14:39:52.000000000 +0200
+@@ -130,18 +130,16 @@ REQUIRES	= nspr \
+ 		  content \
+ 		  xpconnect \
+ 		  unicharutil \
+ 		  pipboot \
+ 		  $(NULL)
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
  
@@ -21,3 +36,8 @@ diff -up mozilla/security/manager/ssl/sr
  # Use local includes because they are inserted before INCLUDES
  # so that Mozilla's nss.h is used, not glibc's
  LOCAL_INCLUDES += $(NSS_CFLAGS)
+ 
+ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_UNICHARUTIL_LIBS) \
+ 		$(MOZ_COMPONENT_LIBS) \
+ 		$(MOZ_JS_LIBS) \