[nss/f19] Update to nss-3.15.5 - Resolves: Bug 1066877

[Elio Maldonado]

commit 008ceb1846f8b0fad0db6731404d2eac3328f995
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Mar 2 13:44:23 2014 -0800

    Update to nss-3.15.5 - Resolves: Bug 1066877
    
    - Pick fix for same files in two packages that can create rpm conflict
    - Move cert9.db, key4.db, and pkcs11.txt and their man pages to the main
    package where they rightfully belong
    - Resolves: Bug 1067091 - Move sharedb files to the %files section

 .gitignore                                         |    2 +-
 ...h-nss-3.15.4-changes-in-freebl-and-softok.patch |  196 --------------------
 nss.spec                                           |   26 ++-
 sources                                            |    2 +-
 4 files changed, 18 insertions(+), 208 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index acdcd65..200ad2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-pem-20140125.tar.bz2
-/nss-3.15.4.tar.gz
+/nss-3.15.5.tar.gz
diff --git a/nss.spec b/nss.spec
index 91977fa..38725e0 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,6 +1,6 @@
 %global nspr_version 4.10.2
-%global nss_util_version 3.15.4
-%global nss_softokn_version 3.15.4
+%global nss_util_version 3.15.5
+%global nss_softokn_version 3.15.5
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
 
@@ -18,8 +18,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.15.4
-Release:          3%{?dist}
+Version:          3.15.5
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -611,19 +611,19 @@ fi
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/secmod.db
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
 %attr(0644,root,root) %doc /usr/share/man/man5/cert8.db.5.gz
 %attr(0644,root,root) %doc /usr/share/man/man5/key3.db.5.gz
 %attr(0644,root,root) %doc /usr/share/man/man5/secmod.db.5.gz
+%attr(0644,root,root) %doc /usr/share/man/man5/cert9.db.5.gz
+%attr(0644,root,root) %doc /usr/share/man/man5/key4.db.5.gz
+%attr(0644,root,root) %doc /usr/share/man/man5/pkcs11.txt.5.gz
 
 %files sysinit
 %defattr(-,root,root)
 %{_libdir}/libnsssysinit.so
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
-%attr(0644,root,root) %doc /usr/share/man/man5/cert9.db.5.gz
-%attr(0644,root,root) %doc /usr/share/man/man5/key4.db.5.gz
-%attr(0644,root,root) %doc /usr/share/man/man5/pkcs11.txt.5.gz
 %{_bindir}/setup-nsssysinit.sh
 # symbolic link to setup-nsssysinit.sh
 %{_bindir}/setup-nsssysinit
@@ -741,6 +741,12 @@ fi
 
 
 %changelog
+* Fri Feb 28 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.5-1
+- Update to nss-3.15.5 - Resolves: Bug 1066877
+- Pick fix for same files in two packages that can create rpm conflict
+- Move cert9.db, key4.db, and pkcs11.txt and their man pages to the main package where they rightfully belong
+- Resolves: Bug 1067091 - Move sharedb files to the %%files section
+
 * Sat Feb 08 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.4-3
 - Revert previous change that moved some sysinit manpages
 - Restore nss-sysinit manpages tar archives to %%files sysinit
diff --git a/sources b/sources
index 5e4569d..aa1bed1 100644
--- a/sources
+++ b/sources
@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 b8a94e863c852e1f8b75e930e76f8640  nss-pem-20140125.tar.bz2
-74738d89615665e3547dc2c0602ab0e6  nss-3.15.4.tar.gz
+7a8cb5418ac8aa15d91d7bc549698268  nss-3.15.5.tar.gz