From 3c8b85b5fa772cb067b568e6707b1c16902b4e141c47bf3a021b57de6ff9ad6c Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 3 Nov 2016 16:11:12 +0000 Subject: [PATCH 1/2] Accepting request 438524 from home:jengelh:branches:devel:libraries:c_c++ - Rectify groups and description OBS-URL: https://build.opensuse.org/request/show/438524 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=179 --- boost.changes | 5 +++++ boost.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/boost.changes b/boost.changes index 7e4d555..d440dfb 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 3 12:20:52 UTC 2016 - jengelh@inai.de + +- Rectify groups and description + ------------------------------------------------------------------- Fri Sep 30 12:13:02 UTC 2016 - adam.majer@suse.de diff --git a/boost.spec b/boost.spec index ac1adb9..f2ca86e 100644 --- a/boost.spec +++ b/boost.spec @@ -264,8 +264,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost Date.Time runtime libraries. %package -n libboost_fiber%{lib_appendix} -Summary: Boost::Filesystem Runtime Libraries -Group: System/Localization +Summary: Boost::Fiber Runtime Libraries +Group: System/Libraries Requires: boost-license%{lib_appendix} %description -n libboost_fiber%{lib_appendix} @@ -273,7 +273,7 @@ This package contains Boost::Fiber runtime library. %package -n libboost_filesystem%{lib_appendix} Summary: Boost::Filesystem Runtime Libraries -Group: System/Localization +Group: System/Libraries Requires: boost-license%{lib_appendix} %description -n libboost_filesystem%{lib_appendix} From ba09852d23798e5a3ba98acb27e93285ad726285c168919b8c2ac4aaed73b3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 9 Nov 2016 09:03:58 +0000 Subject: [PATCH 2/2] Accepting request 439200 from home:adamm:branches:devel:libraries:c_c++ - Revert upstream change that set default python version and ignored user configuration. python-2059618.patch (boo#1006584) OBS-URL: https://build.opensuse.org/request/show/439200 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=180 --- boost.changes | 7 +++++++ boost.spec | 2 ++ python-2059618.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 python-2059618.patch diff --git a/boost.changes b/boost.changes index d440dfb..042cfa8 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 8 13:32:31 UTC 2016 - adam.majer@suse.de + +- Revert upstream change that set default python version and + ignored user configuration. + python-2059618.patch (boo#1006584) + ------------------------------------------------------------------- Thu Nov 3 12:20:52 UTC 2016 - jengelh@inai.de diff --git a/boost.spec b/boost.spec index f2ca86e..3a289e7 100644 --- a/boost.spec +++ b/boost.spec @@ -101,6 +101,7 @@ Patch13: boost-visibility.patch Patch14: boost-1.57.0-python-libpython_dep.patch Patch15: boost-1.57.0-python-abi_letters.patch Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch +Patch17: python-2059618.patch Patch100: gcc_path.patch BuildRequires: chrpath BuildRequires: dos2unix @@ -482,6 +483,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %patch100 -p1 #stupid build machinery copies .orig files diff --git a/python-2059618.patch b/python-2059618.patch new file mode 100644 index 0000000..a98670d --- /dev/null +++ b/python-2059618.patch @@ -0,0 +1,28 @@ +Reverse: 2059618861eb25ae2ed3f1b6ebee8609365cbed9 +Bug: bnc#1006584 + https://svn.boost.org/trac/boost/ticket/12515 + +Index: boost_1_62_0/tools/build/src/tools/python.jam +=================================================================== +--- boost_1_62_0.orig/tools/build/src/tools/python.jam ++++ boost_1_62_0/tools/build/src/tools/python.jam +@@ -903,19 +903,6 @@ local rule configure ( version ? : cmd-o + toolset.add-requirements + $(target-requirements:J=,):$(interpreter-cmd) ; + +- # We also set a default requirement that assigns the first python configured +- # for a particular target OS as the default. This makes it so that we can +- # select a python interpreter with only knowledge of the target OS. And hence +- # can configure different Pythons based on the target OS only. +- local toolset-requirements = [ toolset.requirements ] ; +- local toolset-target-os-requirements +- = [ property.evaluate-conditionals-in-context +- [ $(toolset-requirements).raw ] : $(target-os) ] ; +- if ! in $(toolset-target-os-requirements:G) +- { +- toolset.add-requirements $(target-os):$(version:E=default) ; +- } +- + # Register the right suffix for extensions. + register-extension-suffix $(extension-suffix) : $(target-requirements) ; +