[nss-softokn] - Remove patch obsoleted by the update to 3.13.1

Elio Maldonado emaldonado at fedoraproject.org
Fri Jan 13 20:58:56 UTC 2012


commit 2f13d93372d370446d1793cb8641ba4274e15492
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Jan 13 12:57:45 2012 -0800

    - Remove patch obsoleted by the update to 3.13.1

 nss-softokn-3.12.4-prelink.patch |   55 --------------------------------------
 nss-softokn.spec                 |    8 +++---
 2 files changed, 4 insertions(+), 59 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 66882b9..0a12c2e 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.13.1
-Release:          16%{?dist}
+Release:          17%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -51,8 +51,6 @@ Source3:          nss-softokn-config.in
 
 Patch1:           add-relro-linker-option.patch
 # Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=562116
-Patch2:           nss-softokn-3.12.4-prelink.patch
-# Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=457045
 Patch5:           drbg.patch
 # TODO: Open upstream bug and submmit a patch for this
 Patch8:           softoken-minimal-test-dependencies.patch
@@ -114,7 +112,6 @@ Header and Library files for doing development with Network Security Services.
 %setup -q
 
 %patch1 -p0 -b .relro
-%patch2 -p0 -b .prelink
 %patch5 -p0 -b .drbg
 %patch8 -p0 -b .crypto
 # activate if needed when doing a major update with new apis
@@ -386,6 +383,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Fri Jan 13 2012 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.1-17
+- Remove unneeded prelink patch afterthe nss update to 3.13.1
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list