[nss-softokn] revert /usrmove changes.

[Elio Maldonado]

commit f9407368377bbefc421b4890353e0e52a040a66e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Mar 11 14:56:08 2012 -0700

    revert /usrmove changes.

 nss-softokn.spec |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 9744427..b84f8f6 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -10,14 +10,14 @@
     %{__arch_install_post} \
     %{__os_install_post} \
     $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/%{_lib}/libfreebl3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
 %{nil}
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.13.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -62,9 +62,6 @@ Patch8:           softoken-minimal-test-dependencies.patch
 # NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers. 
 # Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
 Patch9:           iquote.patch
-# Fix gcc 4.7 c++ issue in secmodt.h
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50917
-Patch10:          nss-softokn-fix-gcc47-secmodt.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -74,7 +71,6 @@ Summary:          Freebl library for the Network Security Services
 Group:            System Environment/Base
 Conflicts:        nss < 3.12.2.99.3-5
 Conflicts:        prelink < 0.4.3
-Conflicts:        filesystem < 3
 
 %description freebl
 NSS Softoken Cryptographic Module Freelb Library
@@ -119,9 +115,7 @@ Header and Library files for doing development with Network Security Services.
 %patch5 -p0 -b .drbg
 %patch8 -p0 -b .crypto
 # activate if needed when doing a major update with new apis
-#%patch9 -p0 -b .iquote
-%patch10 -p0 -b .gcc47
-
+%patch9 -p0 -b .iquote
 
 %build
 
@@ -173,8 +167,8 @@ USE_64=1
 export USE_64
 %endif
 
-# uncomment if the iguote patch is activated
-#export IN_TREE_FREEBL_HEADERS_FIRST=1
+# uncommenting since the iquote patch is activated
+export IN_TREE_FREEBL_HEADERS_FIRST=1
 
 # Compile softokn plus needed support
 %{__make} -C ./mozilla/security/coreconf
@@ -282,16 +276,32 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libnssdbm3.so libfreebl3.so
+for file in libsoftokn3.so libnssdbm3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
+# Because libcrypt depends on libfreebl3.so, it is special
+# so we install it in /lib{64}, keeping a symbolic link to it
+# back in /usr/lib{64} to keep everyone else working
+for file in libfreebl3.so
+do
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  ln -sf ../../%{_lib}/libfreebl3.so $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so
+done
+
+# Make sure chk files can be found in both places
+for file in libfreebl3.chk
+do
+  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
+
 # Copy the binaries we ship as unsupported
 for file in shlibsign
 do
@@ -343,6 +353,9 @@ done
 
 %files freebl
 %defattr(-,root,root)
+/%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
+# and these symbolic links
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
 
@@ -377,6 +390,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sun Mar 11 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-2
+- Update to NSS_3_13_3_RTM
+- revert /usrmove changes.
+
 * Thu Mar 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-1
 - Update to NSS_3_13_3_RTM