Fix pk11wrap locking which fixes 'fedpkg new-sources' and 'fedpkg update' hangs

- Bug 872124 - nss-3.14 breaks fedpkg new-sources
- Preliminary fix as patch could change as a result of upstream review
- Renamed the patch file to refer to the correct bug number

nss.spec

@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.14
-Release:          4.1%{?dist}.bug871838test.1
+Release:          5%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -68,7 +68,7 @@ Patch29:          nss-ssl-cbc-random-iv-off-by-default.patch
 Patch40:          nss-3.14.0.0-disble-ocsp-test.patch
 
 # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=357025
-Patch41:          Bug-872838-fix-pk11wrap-locking.patch
+Patch41:          Bug-872124-fix-pk11wrap-locking.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -151,13 +151,7 @@ low level services.
 # activate for stable and beta branches
 #%patch29 -p0 -b .770682
 %patch40 -p1 -b .noocsptest
-
-# It doesn't apply this way
-#%patch41 -p3 -b .872838
-# But this ugly way works
-pushd mozilla/security/nss
-%patch41 -p0 -b .872838
-popd
+%patch41 -p0 -b .872124
 
 %build
 
@@ -590,13 +584,13 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
-* Sun Nov 04 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-4.1.bug871838test.1
-- For scratch build only to test a patch under review
-- Bug 87838 - nss 3.14 breaks fedpkg new-sources
+* Sun Nov 04 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-5
+- Fix pk11wrap locking which fixes 'fedpkg new-sources' and 'fedpkg update' hangs
+- Bug 872124 - nss-3.14 breaks fedpkg new-sources
 
-* Fri Nov 02 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-4
-- Add a dummy source file for testing/preventing fedpkg breakage
-- Facilitates testing fedpkg new-sources and upload commands for breakage such as hangs
+* Thu Nov 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-7
+- Add a dummy source file for testing /preventing fedpkg breakage
+- Helps test the fedpkg new-sources and upload commands for breakage by nss updates
 - Related to Bug 872124 - nss 3.14 breaks fedpkg new-sources
 
 * Thu Nov 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-6