From 33fbf93179f8c1e91ec47f099b4cb04b98d8134d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 10 Jun 2019 20:13:51 +0100
Subject: [PATCH] Related: rhbz#1718063 look for pkg-config
 python-version-embed

---
 ...8063-look-for-pkg-config-python-vers.patch | 28 +++++++++++++++++++
 libreoffice.spec                              |  6 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 0001-Related-rhbz-1718063-look-for-pkg-config-python-vers.patch

diff --git a/0001-Related-rhbz-1718063-look-for-pkg-config-python-vers.patch b/0001-Related-rhbz-1718063-look-for-pkg-config-python-vers.patch
new file mode 100644
index 0000000..664cc6c
--- /dev/null
+++ b/0001-Related-rhbz-1718063-look-for-pkg-config-python-vers.patch
@@ -0,0 +1,28 @@
+From 8c9cd3856067b8cbac26cb6228b2fce786001a3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 10 Jun 2019 20:11:48 +0100
+Subject: [PATCH] Related: rhbz#1718063 look for pkg-config
+ python-version-embed
+
+Change-Id: I7048171501e32d29f9d5a58f0d5fc0b96b318a4e
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e14d3b4f4d45..fa58f9ff3591 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8462,6 +8462,9 @@ if test $enable_python = system; then
+         if test -z "$PKG_CONFIG"; then
+             PYTHON_CFLAGS="-I$python_include"
+             PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
++        elif $PKG_CONFIG --exists python-$python_version-embed; then
++            PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version-embed`"
++            PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version-embed` $python_libs"
+         elif $PKG_CONFIG --exists python-$python_version; then
+             PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`"
+             PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version` $python_libs"
+-- 
+2.21.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 3824c6e..5319f85 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,7 +54,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -247,6 +247,7 @@ Patch3: 0001-Resolves-rhbz-1712823-prefer-help-strings-to-a11y-st.patch
 Patch4: 0001-Resolves-tdf-125099-round-duration-results-in-interp.patch
 Patch5: 0001-Resolves-rhbz-1713827-protect-against-null-ViewShell.patch
 Patch6: 0001-Adapt-to-upcoming-Python-3.8.patch
+Patch7: 0001-Related-rhbz-1718063-look-for-pkg-config-python-vers.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2136,6 +2137,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Mon Jun 10 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.4.2-3
+- Related: rhbz#1718063 look for pkg-config python-version-embed
+
 * Fri Jun 07 2019 Stephan Bergmann <sbergman@redhat.com> - 1:6.2.4.2-2
 - Resolves: rhbz#1718063 adapt to upcoming Python 3.8