Revert patches for 499444

since they use a C++ reserved word and cause compilation of Firefox to fail
This commit is contained in:
Christopher Aillon 2011-02-08 09:39:11 -08:00
parent 1850759856
commit 40064d5204

View File

@ -6,7 +6,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.12.9 Version: 3.12.9
Release: 5%{?dist} Release: 6%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -117,8 +117,8 @@ low level services.
%patch6 -p0 -b .libpem %patch6 -p0 -b .libpem
%patch7 -p0 -b .642433 %patch7 -p0 -b .642433
%patch11 -p1 -b .643134 %patch11 -p1 -b .643134
%patch12 -p1 -b .contenttypes #%patch12 -p1 -b .contenttypes
%patch13 -p1 -b .recurse #%patch13 -p1 -b .recurse
%build %build
@ -495,6 +495,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_libdir}/libnssckfw.a %{_libdir}/libnssckfw.a
%changelog %changelog
* Tue Feb 08 2011 Christopher Aillon <caillon@redhat.com> - 3.12.9-6
- Revert patches for 499444 as they use a C++ reserved word and
cause compilation of Firefox to fail
* Fri Feb 04 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-5 * Fri Feb 04 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-5
- Fix the earlier infinite recursion patch (#499444) - Fix the earlier infinite recursion patch (#499444)
- Remove a header that now nss-softokn-freebl-devel ships - Remove a header that now nss-softokn-freebl-devel ships