From d01d89f81d3bc230b604b076115ab6d4c8ff60f3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Jul 22 2009 15:57:43 +0000
Subject: - do not build special 'optimized' versions for i686, as that's the base

    arch in Fedora now

---

diff --git a/openssl.spec b/openssl.spec
index 6dcebc3..9c420c2 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -17,9 +17,6 @@
 # also be handled in opensslconf-new.h.
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 sparc64 x86_64
 
-# Arches for which we don't build subpackages.
-%define optimize_arches i686
-
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8k
@@ -343,19 +340,6 @@ install -m644 %{SOURCE9} \
 	$RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h
 %endif
 
-%ifarch %{optimize_arches}
-# Remove bits which belong in subpackages.
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/include/openssl
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.so
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3/*
-
-rm -rf $RPM_BUILD_ROOT/%{_bindir}/c_rehash
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1*/*.pl*
-rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pki/tls/misc/*.pl
-%endif
-
 # Remove unused files from upstream fips support
 rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/fips_premain.*
@@ -394,7 +378,6 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 %attr(0644,root,root) %{_mandir}/man5*/*
 %attr(0644,root,root) %{_mandir}/man7*/*
 
-%ifnarch %{optimize_arches}
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/openssl
@@ -412,13 +395,16 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 %attr(0644,root,root) %{_mandir}/man1*/*.pl*
 %dir %{_sysconfdir}/pki/tls/misc
 %{_sysconfdir}/pki/tls/misc/*.pl
-%endif
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 22 2009 Bill Nottingham <notting@redhat.com>
+- do not build special 'optimized' versions for i686, as that's the base
+  arch in Fedora now
+
 * Tue Jun 30 2009 Tomas Mraz <tmraz@redhat.com> 0.9.8k-6
 - abort if selftests failed and random number generator is polled
 - mention EVP_aes and EVP_sha2xx routines in the manpages