diff --git a/baselibs.conf b/baselibs.conf index 46c1c5b..cfd088a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -package boost-devel +boost-devel requires -boost- libboost_atomic1_56_0 libboost_container1_56_0 @@ -14,7 +14,6 @@ libboost_mpi1_56_0 libboost_test1_56_0 libboost_program_options1_56_0 libboost_python1_56_0 -libboost_python3-1_56_0 libboost_random1_56_0 libboost_serialization1_56_0 libboost_signals1_56_0 diff --git a/boost.changes b/boost.changes index 8d1e1b2..ad474e1 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 5 07:44:38 UTC 2014 - dimstar@opensuse.org + +- Revert the python3 building: it resulted in BOTH libboost_python + libraries to be using python 3 instructions, resulting in + failures of all Py2 related packages. + ------------------------------------------------------------------- Thu Oct 2 12:17:18 UTC 2014 - michael.hamann@kit.edu diff --git a/boost.spec b/boost.spec index fec327d..4b5eb1b 100644 --- a/boost.spec +++ b/boost.spec @@ -51,7 +51,7 @@ %define boost_libs1 libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} %define boost_libs2 libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} -%define boost_libs3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_python3-%{lib_appendix} libboost_serialization%{lib_appendix} +%define boost_libs3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} %define boost_libs4 libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} %define boost_libs5 libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} libboost_regex%{lib_appendix} %define boost_libs6 libboost_random%{lib_appendix} libboost_chrono%{lib_appendix} libboost_locale%{lib_appendix} @@ -96,10 +96,8 @@ BuildRequires: libbz2-devel BuildRequires: libexpat-devel BuildRequires: libicu-devel >= 4.4 BuildRequires: python-devel -BuildRequires: python3-devel BuildRequires: xorg-x11-devel #!BuildIgnore: python -#!BuildIgnore: python3 BuildRequires: zlib-devel %if %build_mpi BuildRequires: openmpi-devel @@ -319,15 +317,6 @@ Requires: boost-license%{lib_appendix} %description -n libboost_python%{lib_appendix} This package contains the Boost::Python Runtime libraries. -%package -n libboost_python3-%{lib_appendix} -Summary: Boost::Python3 Runtime Libraries -Group: System/Libraries -Requires: boost-license%{lib_appendix} - -%description -n libboost_python3-%{lib_appendix} -This package contains the Boost::Python3 Runtime libraries - - %package -n libboost_serialization%{lib_appendix} Summary: Boost::Serialization Runtime Libraries Group: System/Libraries @@ -459,9 +448,7 @@ export LONG_DOUBLE_FLAGS="--disable-long-double" %endif BJAM_CONFIG="-d2 -j$JOBS -sICU_PATH=%{_prefix}" PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') -PYTHON3_VERSION=$(python3 -c 'import sys; print(sys.version[:3])') PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION" -PYTHON3_INCLUDE=$(python3 -c "import sysconfig; print(sysconfig.get_path('include'))") export REGEX_FLAGS="--with-icu" export EXPAT_INCLUDE=/usr/include EXPAT_LIBPATH=%{_libdir} export PYTHON_FLAGS @@ -504,8 +491,6 @@ using mpi ; EOF %endif -echo "using python : $PYTHON3_VERSION : /usr/bin/python3 : $PYTHON3_INCLUDE : %{_libdir} ;" >>user-config.jam - # perform the compilation ./b2 --prefix=%{_prefix} --libdir=%{_libdir} --user-config=./user-config.jam @@ -590,7 +575,6 @@ rm -f %{buildroot}%{_libdir}/*.a %post -n libboost_test%{lib_appendix} -p /sbin/ldconfig %post -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig %post -n libboost_python%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_python3-%{lib_appendix} -p /sbin/ldconfig %post -n libboost_regex%{lib_appendix} -p /sbin/ldconfig %post -n libboost_serialization%{lib_appendix} -p /sbin/ldconfig %post -n libboost_signals%{lib_appendix} -p /sbin/ldconfig @@ -619,7 +603,6 @@ rm -f %{buildroot}%{_libdir}/*.a %postun -n libboost_test%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_python%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_python3-%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_regex%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_serialization%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_signals%{lib_appendix} -p /sbin/ldconfig @@ -704,14 +687,9 @@ rm -f %{buildroot}%{_libdir}/*.a %defattr(-, root, root, -) %{_libdir}/libboost_program_options*.so.* -%files -n libboost_python3-%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_python3*.so.* - %files -n libboost_python%{lib_appendix} %defattr(-, root, root, -) %{_libdir}/libboost_python*.so.* -%exclude %{_libdir}/libboost_python3*.so.* %files -n libboost_serialization%{lib_appendix} %defattr(-, root, root, -)