commit 445b786f1cbd112ffa5be14421beb29325a66cec
Merge: acb5237 4f24d9e
Author: Elio Maldonado <emaldona(a)redhat.com>
Date: Fri Feb 28 14:14:16 2014 -0800
Merge branch 'master' into f20
- 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
.gitignore | 2 +-
...h-nss-3.15.4-changes-in-freebl-and-softok.patch | 196 --------------------
nss.spec | 36 ++--
sources | 2 +-
4 files changed, 22 insertions(+), 214 deletions(-)
---
diff --cc nss.spec
index b62cd38,c99892a..c8c7881
--- a/nss.spec
+++ b/nss.spec
@@@ -1,6 -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.4
++%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"
@@@ -737,7 -734,16 +737,12 @@@ f
%changelog
-* Wed Feb 19 2014 Elio Maldonado <emaldona(a)redhat.com> - 3.15.5-1
-- Update to nss-3.15.5
-- Temporarily requiring only nss_softokn_version >= 3.15.4
-- Fix location of sharedb files and their manpages
-- Move cert9.db, key4.db, and pkcs11.txt to the main package
-- Move nss-sysinit manpages tar archives to the main package
-- Resolves: Bug 1066877 - nss-3.15.5 is available
-- Resolves: Bug 1067091 - Move sharedb files to the %%files section
-
-* Thu Feb 06 2014 Elio Maldonado <emaldona(a)redhat.com> - 3.15.4-5
++* Fri Feb 28 2014 Elio Maldonado <emaldona(a)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
++
+* Sat Feb 08 2014 Elio Maldonado <emaldona(a)redhat.com> - 3.15.4-3
- Revert previous change that moved some sysinit manpages
- Restore nss-sysinit manpages tar archives to %%files sysinit
- Removing spurious wildcard entry was the only change needed