rpms/nss/devel nss-enable-pem.patch,1.1,1.2 nss.spec,1.48,1.49

[Kai Engert (kengert)]

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4479

Modified Files:
	nss-enable-pem.patch nss.spec 
Log Message:
rebase nss-enable-pem.patch


nss-enable-pem.patch:

Index: nss-enable-pem.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-enable-pem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-enable-pem.patch	5 Sep 2007 20:00:42 -0000	1.1
+++ nss-enable-pem.patch	5 Aug 2008 23:36:23 -0000	1.2
@@ -1,11 +1,7 @@
-Index: mozilla/security/nss/lib/ckfw/manifest.mn
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/manifest.mn,v
-retrieving revision 1.9
-diff -u -r1.9 manifest.mn
---- mozilla/security/nss/lib/ckfw/manifest.mn   16 Dec 2005 00:48:01 -0000      1.9
-+++ mozilla/security/nss/lib/ckfw/manifest.mn   31 Aug 2007 17:58:23 -0000
-@@ -38,7 +38,7 @@
+diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem ./mozilla/security/nss/lib/ckfw/manifest.mn
+--- ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem	2008-08-05 16:34:23.000000000 -0700
++++ ./mozilla/security/nss/lib/ckfw/manifest.mn	2008-08-05 16:34:30.000000000 -0700
+@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
  
  CORE_DEPTH = ../../..
  
@@ -13,4 +9,4 @@
 +DIRS = builtins pem
  
  PRIVATE_EXPORTS = \
-        ck.h              \
+ 	ck.h		  \


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nss.spec	5 Aug 2008 23:20:52 -0000	1.48
+++ nss.spec	5 Aug 2008 23:36:23 -0000	1.49
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.0.3
-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
@@ -442,7 +442,7 @@
 
 
 %changelog
-* Tue Aug 05 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-5
+* Tue Aug 05 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-6
 - bug 456847, add Requires: pkgconfig
 * Tue Jun 24 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-3
 - nss package should own /etc/prelink.conf.d folder, rhbz#452062