- Remove a header that now nss-softokn-freebl-devel ships, related to #675196

- Backing out earlier patch until further testing from upstream for 3.12.10

nss.spec

@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.9
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -43,7 +43,6 @@ Patch3:           renegotiate-transitional.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           nsspem-642433.patch
 Patch11:          honor-user-trust-preferences.patch
-Patch12:          allow-content-types-beyond-smime.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -116,7 +115,6 @@ low level services.
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .642433
 %patch11 -p1 -b .643134
-%patch12 -p1 -b .contenttypes
 
 
 %build
@@ -358,7 +356,8 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secoidt.h
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secport.h
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h
 
-#remove header shipped in nss-softokn-devel
+#remove header shipped by nss-softokn-devel and nss-softokn-freebl-devel
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/alghmac.h
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/blapit.h
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/ecl-exp.h
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/hasht.h
@@ -492,6 +491,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 %{_libdir}/libnssckfw.a
 
 %changelog
+* Mon Feb 07 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-5
+- Remove a header that now nss-softokn-freebl-devel ships, related to #675196
+- Backing out earlier patch until further testing from upstream for 3.12.10
+
 * Tue Feb 01 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-4
 - Fix infinite recursion when encoding NSS enveloped/digested data (#499444)