rpms/boost/F-13 boost.spec,1.78,1.79
Petr Machata
pmachata at fedoraproject.org
Fri Jun 4 15:49:42 UTC 2010
Author: pmachata
Update of /cvs/pkgs/rpms/boost/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31369
Modified Files:
boost.spec
Log Message:
- Don't distribute cmake support files.
- Related: #597020
- Don't build with mpich2 on s390/s390x/arm.
Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-13/boost.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- boost.spec 13 May 2010 16:59:53 -0000 1.78
+++ boost.spec 4 Jun 2010 15:49:42 -0000 1.79
@@ -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}/ \( -
%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}/ \( -
%endif
%changelog
+* Fri Jun 4 2010 Petr Machata <pmachata at 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 at redhat.com> - 1.41.0-8
- Add an upstream patch that fixes computation of CRC in zlib streams.
- Resolves: #590205
More information about the scm-commits
mailing list