[nss-softokn] Rely on NSS_USE_SYSTEM_SQLITE to disable local sqlite.

[Elio Maldonado]

commit 3a099ab4c54e2815805fd4b05952d2e8965210d7
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Aug 29 11:09:33 2010 -0700

    Rely on NSS_USE_SYSTEM_SQLITE to disable local sqlite.
    
    Define NSS_USE_SYSTEM_SQLITE and remove nss-nolocalsql patch
    Fix rpmlint warnings about macros in comments and changelog

 nss-nolocalsql.patch |   52 --------------------------------------------------
 nss-softokn.spec     |   20 +++++++++++-------
 2 files changed, 12 insertions(+), 60 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 8fb5406..81eb62a 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -20,7 +20,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.12.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -38,21 +38,20 @@ BuildRequires:    psmisc
 BuildRequires:    perl
 
 Source0:          %{name}-%{version}-stripped.tar.bz2
-# The nss-softokn tar ball is a subset of nss-%{version}-stripped.tar.bz2, 
+# The nss-softokn tar ball is a subset of nss-%%{version}-stripped.tar.bz2, 
 # Therefore we use the nss-split-softokn.sh script to keep only what we need.
-# Download the nss tarball via CVS from the nss propect and follow these
-# steps to make the r tarball for nss-util out of the for nss:
+# Download the nss tarball via git from the nss propect and follow these
+# steps to make the tarball for nss-util out of the one for nss:
 # fedpkg clone nss
 # fedpkg clone nss-softokn
 # cd nss-softokn
 # cp ../../nss/devel/${version}-stripped.tar.bz2  .
 # sh ./nss-split-softokn.sh ${version}
-# A file named %{name}-%{version}--stripped.tar.bz2 should appear
+# A file named %%{name}-%%{version}-stripped.tar.bz2 should appear
 Source1:          nss-split-softokn.sh
 Source2:          nss-softokn.pc.in
 Source3:          nss-softokn-config.in
 
-Patch1:           nss-nolocalsql.patch
 Patch2:           nss-softokn-3.12.4-prelink.patch
 Patch3:           nss-softokn-3.12.4-fips-fix.patch
 Patch4:           freebl-no-depend.patch
@@ -99,9 +98,8 @@ Header and Library files for doing development with Network Security Services.
 %prep
 %setup -q
 
-%patch1 -p0
 %patch2 -p0 -b .prelink
-%patch3 -p0
+%patch3 -p0 -b .fipsfix
 %patch4 -p0 -b .freeblnodepend
 
 %build
@@ -138,6 +136,8 @@ NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
 export NSS_INCLUDE_DIR
 export NSS_LIB_DIR
 
+NSS_USE_SYSTEM_SQLITE=1
+export NSS_USE_SYSTEM_SQLITE
 
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
@@ -315,6 +315,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sat Aug 29 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-2
+- Define NSS_USE_SYSTEM_SQLITE and remove nss-nolocalsql patch
+- Fix rpmlint warnings about macros in comments and changelog
+
 * Mon Aug 16 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-1
 - Update to 3.12.7
 - Fix build files to ensure nsslowhash.h is included in public headers