#1 Use boost169 for Python 2 support
Closed 2 years ago by churchyard. Opened 2 years ago by pviktori.
rpms/ pviktori/k3d boost169  into  master

file modified
+10 -4
@@ -1,6 +1,6 @@ 

  Name:           k3d

  Version:        0.8.0.6

- Release:        24%{?dist}

+ Release:        25%{?dist}

  Summary:        A 3D Modeling, Animation and Rendering System

  

  License:        GPLv2+
@@ -37,8 +37,8 @@ 

  # This list is alpha sorted.

  BuildRequires:  gcc-c++

  BuildRequires:  asciidoc

- BuildRequires:  boost-devel

- BuildRequires:  boost-python%{python_version}-devel

+ BuildRequires:  boost169-devel

+ BuildRequires:  boost169-python%{python_version}-devel

  BuildRequires:  bzip2-devel

  BuildRequires:  cairomm-devel

  BuildRequires:  cmake
@@ -150,8 +150,11 @@ 

  cd BUILD

  %if 0%{fedora} >= 30

  %if 0%{python_version} < 3

+ # The boost169 compat library retains Python 2 support

  %cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \

-   -DBoost_PYTHON_LIBRARY=%{_libdir}/libboost_python27.so \

+     -DBOOST_LIBRARYDIR=%{_libdir}/boost169 \

+     -DBOOST_INCLUDEDIR=%{_includedir}/boost169 \

+   -DBoost_PYTHON_LIBRARY=%{_libdir}/boost169/libboost_python27.so \

    -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} ..

  %else

  %cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \
@@ -271,6 +274,9 @@ 

  

  

  %changelog

+ * Tue Nov 05 2019 Petr Viktorin <pviktori@redhat.com> - 0.8.0.6-25

+ - Use boost169 for Python 2 support

+ 

  * Thu Aug 08 2019 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.8.0.6-24

  - Sync sources with upstream.

  

See the discussion in: https://bugzilla.redhat.com/show_bug.cgi?id=1767503

This builds and passes %check, but I don't know how to test further.

Pull-Request has been closed by churchyard

2 years ago