[nss-util] - Fix a gnuc def typo - This is a debug build with optimizations disabled

[Elio Maldonado]

commit 4bdaa792bc7f76140bb74e9961923d59e407403f
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Nov 26 10:29:12 2011 -0800

    - Fix a gnuc def typo
    - This is a debug build with optimizations disabled

 gnuc-minor-def-fix.patch |   12 ++++++++++++
 nss-util.spec            |   19 +++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/gnuc-minor-def-fix.patch b/gnuc-minor-def-fix.patch
new file mode 100644
index 0000000..f210af2
--- /dev/null
+++ b/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-util.spec b/nss-util.spec
index 499bad0..2312a9a 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.13.1
-Release:          1%{?dist}
+Release:          1.1%{?dist}.test.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -31,6 +31,8 @@ Source1:          nss-split-util.sh
 Source2:          nss-util.pc.in
 Source3:          nss-util-config.in
 
+# Patch from nss, remove when we rebase
+Patch24:           gnuc-minor-def-fix.patch
 
 %description
 Utilities for Network Security Services and the Softoken module
@@ -51,17 +53,18 @@ Header and library files for doing development with Network Security Services.
 
 %prep
 %setup -q
-
+# remove when we rebase
+%patch24 -p1 -b .gnuc-minor
 
 %build
 
 # Enable compiler optimizations and disable debugging code
-BUILD_OPT=1
-export BUILD_OPT
+#BUILD_OPT=1
+#export BUILD_OPT
 
 # Uncomment to disable optimizations
-#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O0/g'`
-#export RPM_OPT_FLAGS
+RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O0/g'`
+export RPM_OPT_FLAGS
 
 # Generate symbolic info for debuggers
 XCFLAGS=$RPM_OPT_FLAGS
@@ -202,6 +205,10 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Sat Nov 26 2011 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.1-1.1.test.1
+- Fix a gnuc def typo
+- This is a debug build with optimizations disabled
+
 * Thu Nov 03 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-1
 - Update to NSS_3_13_1_RTM