commit ffe14088def3a2405df669dca32bcf99b6cc9198
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Oct 21 15:43:57 2012 -0400
Update to NSS_3_14_RC
- Remove the temporary bootstrapping modifications
nss-softokn.spec | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 9fce271..303e968 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -4,16 +4,10 @@
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
-# FIXME: Remove the export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} line
-# once we have boostrapped the buildroot with the new freebl. This is done
-# to guarantee that shlibsign will use the in-tree freebl, otherwise the
-# the digestLen check and signature verification would fail.
-# Produce .chk files for the final stripped binaries
%define __spec_install_post \
%{?__debug_package:%{__debug_install_post}} \
%{__arch_install_post} \
%{__os_install_post} \
- export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
@@ -22,7 +16,7 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
Version: 3.14
-Release: 0.1%{?dist}.rc1.1
+Release: 0.1%{?dist}.rc1.2
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -300,12 +294,6 @@ do
%{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done
-# FIXME: Remove this section once the bootstrapping in done
-# nss-softokn-devel will no longer own sechash.h or secmodt.h, nss-devel will.
-for file in mozilla/dist/public/nss/sechash.h mozilla/dist/public/nss/secmodt.h
-do
- %{__rm} -f $file
-done
# Copy the include files we want
for file in mozilla/dist/public/nss/*.h
@@ -383,6 +371,10 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Sun Oct 21 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc1.2
+- Update to NSS_3_14_RC
+- Remove the temporary bootstrapping modifications
+
* Sun Oct 21 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc.1
- Update to NSS_3_14_RC1
- Remove patches rendered obsolete by this update and update others