rpms/nss-softokn/F-13 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 nss-nolocalsql.patch, 1.3, 1.4 nss-softokn.spec, 1.39, 1.40

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss-softokn/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30832

Modified Files:
	.cvsignore sources nss-nolocalsql.patch nss-softokn.spec 
Log Message:
Bump NVR to be greater than ones for nss-softokn subpackages in F11 - Resolves: rhbz#601407


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Sep 2009 18:00:08 -0000	1.3
+++ .cvsignore	8 Jun 2010 01:09:45 -0000	1.4
@@ -1 +1 @@
-nss-softokn-3.12.4-stripped.tar.bz2
+nss-softokn-3.12.6-stripped.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Sep 2009 17:28:22 -0000	1.4
+++ sources	8 Jun 2010 01:09:45 -0000	1.5
@@ -1 +1 @@
-d4f0a0b8824bb9864f18f38ec965873c  nss-softokn-3.12.4-stripped.tar.bz2
+f1e6c3944889697d2aeacd94b594083b  nss-softokn-3.12.6-stripped.tar.bz2

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-13/nss-nolocalsql.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-nolocalsql.patch	5 Sep 2009 18:49:46 -0000	1.3
+++ nss-nolocalsql.patch	8 Jun 2010 01:09:45 -0000	1.4
@@ -1,26 +1,26 @@
 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-06-07 15:47:39.536059350 -0700
++++ ./mozilla/security/nss/lib/Makefile	2010-06-07 15:48:59.180059336 -0700
+@@ -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)
 diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
-+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2010-06-07 15:50:02.079059333 -0700
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2010-06-07 15:50:58.308059358 -0700
 @@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
  
  DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
@@ -35,8 +35,8 @@ diff -up ./mozilla/security/nss/lib/soft
  CSRCS = \
  	dbmshim.c \
 diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
---- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
-+++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2010-06-07 15:51:37.872059382 -0700
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2010-06-07 15:52:18.404059529 -0700
 @@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
  
  DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-13/nss-softokn.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nss-softokn.spec	6 Jun 2010 23:40:08 -0000	1.39
+++ nss-softokn.spec	8 Jun 2010 01:09:45 -0000	1.40
@@ -17,8 +17,8 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.12.4
-Release:          23%{?dist}
+Version:          3.12.6
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -312,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Jun 07 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-2
+- Bump NVR to be greater than those for nss-softokn subpackages in F11 (rhbz#601407)
+
 * Sun Jun 06 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-23
 - Fix changelog comment