[nss/f16] - Fix the missing CERTDB_TERMINAL_RECORD symbol problem - Removed unwanted /usr/include/nss3 in fron

[Elio Maldonado]

commit f67889f49ca80d10d41e56eaaaccbdd0c177d235
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Dec 5 15:51:15 2011 -0800

    - Fix the missing CERTDB_TERMINAL_RECORD symbol problem
    - Removed unwanted /usr/include/nss3 in front of the normal cflags include path
    - Removed ugly and unnecessary patch dealing with CERTDB_TERMINAL_RECORD

 nss.spec                       |   11 ++---
 nsspem-use-system-freebl.patch |    5 +--
 terminalrecord.patch           |   90 ----------------------------------------
 3 files changed, 6 insertions(+), 100 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index 6d5cbd6..b76cef2 100644
--- a/nss.spec
+++ b/nss.spec
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.13.1
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -160,7 +160,6 @@ low level services.
 %patch25 -p0 -b .systemfreebl
 %patch26 -p0 -b .nofipstest
 %patch27 -p0 -b .nosha224
-%patch28 -p0 -b .terminalrecord
 
 
 %build
@@ -192,10 +191,6 @@ NSPR_LIB_DIR=%{_libdir}
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
-
-export NSSUTIL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
-export NSSUTIL_LIB_DIR=%{_libdir}
 export FREEBL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-softokn | sed 's/-I//'`
 export FREEBL_LIB_DIR=%{_libdir}
 export USE_SYSTEM_FREEBL=1
@@ -581,6 +576,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Mon Dec 05 2011 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.1-6
+- Removed unwanted /usr/include/nss3 in front of the normal cflags include path
+- Removed unnecessary patch dealing with CERTDB_TERMINAL_RECORD, it's visible
+
 * Sun Dec 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-5
 - Statically link the pem module against system freebl found in buildroot
 - Disabling sha224-related powerup selftest until we update softokn
diff --git a/nsspem-use-system-freebl.patch b/nsspem-use-system-freebl.patch
index a8dbdc7..6bcd9d6 100644
--- a/nsspem-use-system-freebl.patch
+++ b/nsspem-use-system-freebl.patch
@@ -1,13 +1,10 @@
 diff -up ./mozilla/security/coreconf/Linux.mk.sytemfreebl ./mozilla/security/coreconf/Linux.mk
 --- ./mozilla/security/coreconf/Linux.mk.sytemfreebl	2011-12-03 22:07:23.924156119 -0800
 +++ ./mozilla/security/coreconf/Linux.mk	2011-12-03 22:08:28.322328345 -0800
-@@ -182,6 +182,12 @@ endif
+@@ -182,6 +182,9 @@ endif
  USE_SYSTEM_ZLIB = 1
  ZLIB_LIBS = -lz
  
-+USE_SYSTEM_NSSUTIL = 1
-+NSSUTIL_LIBS = -lnssutil3
-+
 +USE_SYSTEM_FREEBL = 1
 +FREEBL_LIBS = -lfreebl3
 +