- Don't distribute cmake support files.

- Related: #597020
- Don't build with mpich2 on s390/s390x/arm.

boost.spec

@@ -12,12 +12,17 @@
 
 # Configuration of MPI backends
 %bcond_without mpich2
-%bcond_without openmpi
+%ifarch s390 s390x arm
+  # No OpenMPI support on these arches
+  %bcond_with openmpi
+%else
+  %bcond_without openmpi
+%endif
 
 Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.41.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Boost
 URL: http://sodium.resophonic.com/boost-cmake/%{version}.cmake0/
 Group: System Environment/Libraries
@@ -513,6 +518,13 @@ done
 # Remove scripts used to generate include files
 find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{__rm} -f {} \;
 
+# boost support of cmake needs some tuning.  For the time being, leave
+# the files out, and rely on cmake's FindBoost to DTRT, as it had been
+# doing in pre-cmake-boost times.  For further info, see:
+#   https://bugzilla.redhat.com/show_bug.cgi?id=597020
+%{__rm} -Rfv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+%{__rm} -Rfv $RPM_BUILD_ROOT%{_datadir}/cmake/%{name}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -656,8 +668,6 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
 %doc LICENSE_1_0.txt
 %{_includedir}/%{name}
 %{_libdir}/libboost_*.so
-%{_datadir}/%{name}-%{version}
-%{_datadir}/cmake/%{name}/BoostConfig*.cmake
 
 %files static
 %defattr(-, root, root, -)
@@ -725,6 +735,11 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
 %endif
 
 %changelog
+* Fri Jun  4 2010 Petr Machata <pmachata@redhat.com> - 1.41.0-9
+- Don't distribute cmake support files.
+- Related: #597020
+- Don't build with mpich2 on s390/s390x/arm.
+
 * Tue May 11 2010 Petr Machata <pmachata@redhat.com> - 1.41.0-8
 - Add an upstream patch that fixes computation of CRC in zlib streams.
 - Resolves: #590205