- a minor speed-up (invoke perl -pi -e once for many files)

- generalized the ix86 architecture condition

Changed files:
    openssl.spec -> 1.117

diff --git a/openssl.spec b/openssl.spec
index a3680bb0be4e5b8c9a16561b292224f69e964bc9..48372fb317806904616ae1c5057fb4b403de6536 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -186,9 +186,8 @@ RC4, RSA 
 %patch5 -p1
 
 %build
-for f in ` grep -r "%{_prefix}/local/bin/perl" . | cut -d":" -f1`; do
-%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' $f
-done
+%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
+       `grep -r "%{_prefix}/local/bin/perl" . | cut -d":" -f1`
 
 touch Makefile.*
 
@@ -196,12 +195,13 @@ touch Makefile.*
 
 OPTFLAGS="%{rpmcflags}"
 export OPTFLAGS
+%ifarch %{ix86}
 %ifarch i386 i486
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
-%endif
-%ifarch i586 i686 athlon pentium3
+%else
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared
 %endif
+%endif
 %ifarch amd64
 ./Configure --openssldir=%{_var}/lib/%{name} linux-x86_64 shared
 %endif