- hack to fix build on i386

- use default x86 code on i486 (only i386 is exceptional)

Changed files:
    openssl.spec -> 1.133

diff --git a/openssl.spec b/openssl.spec
index 36b3b2b9a8f7e0ab9b755bf17885b29e036903fc..0c8e8119d4377705b4c64feaddfa002dfb665e58 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -181,6 +181,10 @@ RC4, RSA 
 %patch2 -p1
 %patch3 -p1
 
+# conflicts with i386-only DES implementation
+# (missing #ifdef OPENSSL_FIPS  ...  #endif)
+:> fips/des/asm/fips-dx86-elf.s
+
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
        `grep -l -r "%{_prefix}/local/bin/perl" *`
@@ -192,7 +196,8 @@ touch Makefile.*
 OPTFLAGS="%{rpmcflags}"
 export OPTFLAGS
 %ifarch %{ix86}
-%ifarch i386 i486
+%ifarch i386
+# allow running on 80386 (default code uses bswapl available on i486+)
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
 %else
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared