- fixes typo in header file

- release 2

Changed files:
    nss-gnuc-minor-def-fix.patch -> 1.1
    nss.spec -> 1.114

diff --git a/nss-gnuc-minor-def-fix.patch b/nss-gnuc-minor-def-fix.patch
new file mode 100644 (file)
index 0000000..f210af2
--- /dev/null
+++ b/nss-gnuc-minor-def-fix.patch
@@ -0,0 +1,12 @@
+diff -up nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h
+--- nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo      2011-11-10 12:44:17.683967574 -0600
++++ nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h 2011-11-10 12:44:24.146886778 -0600
+@@ -362,7 +362,7 @@ typedef CK_ULONG          CK_TRUST;
+  *  cast the resulting value to the deprecated type in the #define, thus
+  *  producting the warning when the #define is used.
+  */
+-#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
++#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
+ /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
+  * is a gcc version issue rather than mac or ppc specific */
+ typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));

diff --git a/nss.spec b/nss.spec
index 9efdb6748a4455a763c5f6068aa8e4f1f1cb12b9..e2ce7acc747810a5cab7f26a66cbca917f5b8c62 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.13.1
-Release:       1
+Release:       2
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
@@ -19,6 +19,7 @@ Source2:      %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Patch0:                %{name}-Makefile.patch
+Patch1:                %{name}-gnuc-minor-def-fix.patch
 URL:           http://www.mozilla.org/projects/security/pki/nss/
 BuildRequires: nspr-devel >= 1:4.8.9
 BuildRequires: nss-tools
@@ -100,6 +101,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if 0%{!?debug:1}
 # strip before signing