From 970a5d230c6086fd3ad74558c8de210b5c7397bd Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: May 05 2019 17:46:07 +0000
Subject: Fix finding Boost::Python3 on Fedora >= 30


* Sun May 05 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.2.7-2
- Fix finding Boost::Python3 on Fedora >= 30

---

diff --git a/calamares-3.2.7-boost-python3.patch b/calamares-3.2.7-boost-python3.patch
new file mode 100644
index 0000000..5f4de2f
--- /dev/null
+++ b/calamares-3.2.7-boost-python3.patch
@@ -0,0 +1,26 @@
+diff -ur calamares-3.2.7/CMakeModules/BoostPython3.cmake calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake
+--- calamares-3.2.7/CMakeModules/BoostPython3.cmake	2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake	2019-05-05 19:42:40.290272157 +0200
+@@ -15,6 +15,11 @@
+ # libboost_python-3.4.so
+ # depending on what python's targets you selected during install
+ #
++# On Fedora >= 30 instead, the boost-python3-devel provides boost library with a
++# name like:
++# libboost_python37.so
++# depending on what python's targets you selected during install
++#
+ # find_boost_python3() tries to find the package with different component
+ # names. By default it tries "python3", "python-py$suffix" and
+ # "python-$dotsuffix", where suffix is based on the `python_version` argument.
+@@ -47,6 +52,10 @@
+     _find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found )
+ 
+     if (NOT _fbp_found)
++        _find_boost_python3_int( ${boost_version} python${_fbp_python_short_version} _fbp_found )
++    endif()
++
++    if (NOT _fbp_found)
+         # The following loop changes the searched name for Gentoo based distributions
+         # turns "3.4.123abc" into "3.4"
+         string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2" _fbp_python_short_version ${python_version} )
diff --git a/calamares.spec b/calamares.spec
index fa6fcb4..8a70166 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -45,6 +45,9 @@ Patch0:         calamares-3.2.7-default-settings.patch
 # use kdesu instead of pkexec (works around #1171779)
 Patch1:         calamares-3.2.7-kdesu.patch
 
+# fix finding Boost::Python3 on Fedora >= 30
+Patch2:         calamares-3.2.7-boost-python3.patch
+
 # Calamares is only supported where live images (and GRUB) are. (#1171380)
 # This list matches the livearches global from anaconda.spec
 ExclusiveArch:  %{ix86} x86_64
@@ -213,6 +216,7 @@ developing custom modules for Calamares.
 # delete backup files so they don't get installed
 rm -f src/modules/*/*.conf.default-settings
 %patch1 -p1 -b .kdesu
+%patch2 -p1 -b .boost-python3
 
 %build
 mkdir -p %{_target_platform}
@@ -360,6 +364,9 @@ EOF
 
 
 %changelog
+* Sun May 05 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.2.7-2
+- Fix finding Boost::Python3 on Fedora >= 30
+
 * Sun May 05 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.2.7-1
 - Update to 3.2.7 and update BuildRequires and Requires
 - Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop