# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1331935326 -3600
# Node ID b34e9b7953b9df289797ac57b2d5937988e47dab
# Parent  aaff9e1edf72af71eda70358ef1a9f81b882a38f
mozilla-system-nss.patch committed upstream

diff -r aaff9e1edf72 -r b34e9b7953b9 MozillaFirefox/firefox-esr.spec
--- a/MozillaFirefox/firefox-esr.spec	Tue Mar 06 19:55:43 2012 +0100
+++ b/MozillaFirefox/firefox-esr.spec	Fri Mar 16 23:02:06 2012 +0100
@@ -92,7 +92,6 @@
 Patch14:        mozilla-disable-neon-option.patch
 Patch15:        mozilla-bmo703534.patch
 Patch16:        mozilla-yarr-pcre.patch
-Patch17:        mozilla-system-nss.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -217,7 +216,6 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 #
 %patch31 -p1
 %patch32 -p1
diff -r aaff9e1edf72 -r b34e9b7953b9 MozillaFirefox/mozilla-system-nss.patch
--- a/MozillaFirefox/mozilla-system-nss.patch	Tue Mar 06 19:55:43 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-system-nss.patch
\ No newline at end of file
diff -r aaff9e1edf72 -r b34e9b7953b9 mozilla-system-nss.patch
--- a/mozilla-system-nss.patch	Tue Mar 06 19:55:43 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Takanori MATSUURA <t.matsuu@gmail.com>
-# Date 1323798527 -32400
-# Node ID f98be8c8e4e799e7ba8ddc367122edeccaaaca43
-# Parent  4b71b1e9cc0c30b13ee67d71d4030b6754ab0e38
-Bug 710268 - sign NSS libraries only when they exist
-
-diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
---- a/toolkit/mozapps/installer/packager.mk
-+++ b/toolkit/mozapps/installer/packager.mk
-@@ -566,27 +566,27 @@ NSSDBM		= $(DIST)/$(STAGEPATH)$(MOZ_PKG_
- FREEBL		= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl3$(NSS_DLL_SUFFIX)
- FREEBL_32FPU	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32fpu_3$(DLL_SUFFIX)
- FREEBL_32INT	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int_3$(DLL_SUFFIX)
- FREEBL_32INT64	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int64_3$(DLL_SUFFIX)
- FREEBL_64FPU	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64fpu_3$(DLL_SUFFIX)
- FREEBL_64INT	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64int_3$(DLL_SUFFIX)
- 
- SIGN_NSS	+= \
--  $(SIGN_CMD) $(SOFTOKN) && \
--  $(SIGN_CMD) $(NSSDBM) && \
-+  if test -f $(SOFTOKN); then $(SIGN_CMD) $(SOFTOKN); fi && \
-+  if test -f $(NSSDBM); then $(SIGN_CMD) $(NSSDBM); fi && \
-   if test -f $(FREEBL); then $(SIGN_CMD) $(FREEBL); fi && \
-   if test -f $(FREEBL_32FPU); then $(SIGN_CMD) $(FREEBL_32FPU); fi && \
-   if test -f $(FREEBL_32INT); then $(SIGN_CMD) $(FREEBL_32INT); fi && \
-   if test -f $(FREEBL_32INT64); then $(SIGN_CMD) $(FREEBL_32INT64); fi && \
-   if test -f $(FREEBL_64FPU); then $(SIGN_CMD) $(FREEBL_64FPU); fi && \
-   if test -f $(FREEBL_64INT); then $(SIGN_CMD) $(FREEBL_64INT); fi;
- 
- endif # MOZ_PSM
--endif # !CROSS_COMPILE
-+endif # MOZ_CAN_RUN_PROGRAMS
- 
- NO_PKG_FILES += \
- 	core \
- 	bsdecho \
- 	js \
- 	js-config \
- 	jscpucfg \
- 	nsinstall \
diff -r aaff9e1edf72 -r b34e9b7953b9 series
--- a/series	Tue Mar 06 19:55:43 2012 +0100
+++ b/series	Fri Mar 16 23:02:06 2012 +0100
@@ -20,7 +20,6 @@
 mozilla-disable-neon-option.patch
 mozilla-bmo703534.patch
 mozilla-yarr-pcre.patch
-mozilla-system-nss.patch
 
 # Firefox patches
 firefox-browser-css.patch
diff -r aaff9e1edf72 -r b34e9b7953b9 xulrunner/mozilla-system-nss.patch
--- a/xulrunner/mozilla-system-nss.patch	Tue Mar 06 19:55:43 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-system-nss.patch
\ No newline at end of file
diff -r aaff9e1edf72 -r b34e9b7953b9 xulrunner/xulrunner-esr.spec
--- a/xulrunner/xulrunner-esr.spec	Tue Mar 06 19:55:43 2012 +0100
+++ b/xulrunner/xulrunner-esr.spec	Fri Mar 16 23:02:06 2012 +0100
@@ -84,7 +84,6 @@
 Patch16:        mozilla-disable-neon-option.patch
 Patch17:        mozilla-bmo703534.patch
 Patch18:        mozilla-yarr-pcre.patch
-Patch19:        mozilla-system-nss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
 Requires(post):  update-alternatives coreutils
@@ -206,7 +205,6 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 
 %build
 # no need to add build time to binaries