rpms/nss-util/F-12 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 nss-nolocalsql.patch, 1.2, 1.3 nss-util.spec, 1.20, 1.21

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss-util/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28707

Modified Files:
	.cvsignore sources nss-nolocalsql.patch nss-util.spec 
Log Message:
Update to 3.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Dec 2009 15:23:51 -0000	1.4
+++ .cvsignore	6 Mar 2010 17:57:36 -0000	1.5
@@ -1 +1 @@
-nss-util-3.12.5.tar.bz2
+nss-util-3.12.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Dec 2009 15:23:52 -0000	1.4
+++ sources	6 Mar 2010 17:57:36 -0000	1.5
@@ -1 +1 @@
-00e44ffb9e3338233bca14d690c176c7  nss-util-3.12.5.tar.bz2
+f55eadf2adf5c5e1afec6787b3b60d95  nss-util-3.12.6.tar.bz2

nss-nolocalsql.patch:
 Makefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/F-12/nss-nolocalsql.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-nolocalsql.patch	5 Sep 2009 19:45:10 -0000	1.2
+++ nss-nolocalsql.patch	6 Mar 2010 17:57:36 -0000	1.3
@@ -1,20 +1,20 @@
 diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
---- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
-+++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
-@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
- DIRS := $(filter-out fortcrypt,$(DIRS))
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2010-02-27 16:40:25.891777537 -0800
++++ ./mozilla/security/nss/lib/Makefile	2010-02-27 16:41:59.175902327 -0800
+@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB
+ ZLIB_SRCDIR = zlib  # Add the zlib directory to DIRS.
  endif
  
 -ifndef MOZILLA_CLIENT
 -ifndef NSS_USE_SYSTEM_SQLITE
--DIRS := sqlite $(DIRS)
+-SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
 -endif
 -endif
 +#ifndef MOZILLA_CLIENT
 +#ifndef NSS_USE_SYSTEM_SQLITE
-+#DIRS := sqlite $(DIRS)
++#SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
 +#endif
 +#endif
  
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL)                              #
+ ifndef MOZILLA_CLIENT
+ ifeq ($(OS_ARCH),Linux)


Index: nss-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/F-12/nss-util.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nss-util.spec	19 Jan 2010 01:18:22 -0000	1.20
+++ nss-util.spec	6 Mar 2010 17:57:36 -0000	1.21
@@ -1,9 +1,9 @@
-%global nspr_version 4.8
+%global nspr_version 4.8.4
 
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
-Version:          3.12.5
-Release:          2%{?dist}
+Version:          3.12.6
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -32,7 +32,7 @@ Source1:          nss-split-util.sh
 Source2:          nss-util.pc.in
 Source3:          nss-util-config.in
 
-Patch2:           nss-nolocalsql.patch
+Patch1:           nss-nolocalsql.patch
 
 %description
 Utilities for Network Security Services and the Softoken module
@@ -54,7 +54,7 @@ Header and library files for doing devel
 %prep
 %setup -q
 
-%patch2 -p0
+%patch1 -p0 -b .nolocalsql
 
 %build
 
@@ -200,6 +200,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Sat Mar 06 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-1
+- Update to 3.12.6
+
 * Mon Jan 18 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.5-2
 - Fix in nss-util-config.in