- rel 2; don't include prtypes.h (not needed and causing glibc build failure) - patch...

diff --git a/hasht-dont-include-prtypes.patch b/hasht-dont-include-prtypes.patch
new file mode 100644 (file)
index 0000000..46efefb
--- /dev/null
+++ b/hasht-dont-include-prtypes.patch
@@ -0,0 +1,11 @@
+diff -up ./nss/lib/util/hasht.h.prtypes ./nss/lib/util/hasht.h
+--- ./nss/lib/util/hasht.h.prtypes     2013-04-19 09:56:51.656957336 -0700
++++ ./nss/lib/util/hasht.h     2013-04-19 09:57:19.841115823 -0700
+@@ -6,7 +6,6 @@
+ #ifndef _HASHT_H_
+ #define _HASHT_H_
+ 
+-#include "prtypes.h"
+ 
+ /* Opaque objects */
+ typedef struct SECHashObjectStr SECHashObject;

diff --git a/nss.spec b/nss.spec
index 523e8fc48009834a3d7e3b11ad3979e35f4717d9..adcfc77678f85e9d551769d934168431829dbe87 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -3,7 +3,7 @@ Summary:        NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
 Version:       3.15.1
-Release:       1
+Release:       2
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
@@ -14,6 +14,7 @@ Source2:      %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Patch0:                %{name}-Makefile.patch
+Patch1:                hasht-dont-include-prtypes.patch
 URL:           http://www.mozilla.org/projects/security/pki/nss/
 BuildRequires: nspr-devel >= 1:4.10
 BuildRequires: nss-tools
@@ -95,6 +96,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if 0%{!?debug:1}
 # strip before signing