[nss-softokn] Revert the previous two commits

[Elio Maldonado]

commit 4aa4fb202bd4f2cf8cf8ece47202e35931aeec23
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Mar 11 15:15:21 2012 -0700

    Revert the previous two commits
    
    - They were intended for f16

 nss-softokn-fix-gcc47-secmodt.patch |   12 ++++++++++
 nss-softokn.spec                    |   41 ++++++++++------------------------
 2 files changed, 24 insertions(+), 29 deletions(-)
---
diff --git a/nss-softokn-fix-gcc47-secmodt.patch b/nss-softokn-fix-gcc47-secmodt.patch
new file mode 100644
index 0000000..30f3fbb
--- /dev/null
+++ b/nss-softokn-fix-gcc47-secmodt.patch
@@ -0,0 +1,12 @@
+diff -up ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47 ./mozilla/security/nss/lib/softoken/secmodt.h
+--- ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47	2012-03-01 12:32:02.922117184 -0800
++++ ./mozilla/security/nss/lib/softoken/secmodt.h	2012-03-01 12:33:04.701241707 -0800
+@@ -342,7 +342,7 @@ typedef PRUint32 PK11AttrFlags;
+ #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
+ 
+ #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \
+-"Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS "})"
++"Flags=internal,critical" fips" slotparams=("#slot"={" SECMOD_SLOT_FLAGS"})"
+ 
+ #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
+ #define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1)
diff --git a/nss-softokn.spec b/nss-softokn.spec
index b84f8f6..9744427 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/%{_lib}/libfreebl3.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 \
 %{nil}
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.13.3
-Release:          2%{?dist}
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -62,6 +62,9 @@ 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
@@ -71,6 +74,7 @@ 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
@@ -115,7 +119,9 @@ 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
+#%patch9 -p0 -b .iquote
+%patch10 -p0 -b .gcc47
+
 
 %build
 
@@ -167,8 +173,8 @@ USE_64=1
 export USE_64
 %endif
 
-# uncommenting since the iquote patch is activated
-export IN_TREE_FREEBL_HEADERS_FIRST=1
+# uncomment if the iguote patch is activated
+#export IN_TREE_FREEBL_HEADERS_FIRST=1
 
 # Compile softokn plus needed support
 %{__make} -C ./mozilla/security/coreconf
@@ -276,32 +282,16 @@ 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
+for file in libsoftokn3.so libnssdbm3.so libfreebl3.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
@@ -353,9 +343,6 @@ done
 
 %files freebl
 %defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
-# and these symbolic links
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
 
@@ -390,10 +377,6 @@ 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