[libreoffice] RHEL-6 python is pre pkg-config

Caolán McNamara caolanm at fedoraproject.org
Thu Aug 15 08:01:18 UTC 2013


commit 13644791eedbe847060a8f72a2332097ae876395
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 15 09:01:02 2013 +0100

    RHEL-6 python is pre pkg-config

 libreoffice.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 95d9ffc..cdec5aa 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1070,8 +1070,13 @@ export CXXFLAGS=$ARCH_FLAGS
 
 %if ! 0%{libo_python3}
 export PYTHON=%{_bindir}/python
+%if 0%{?fedora} || 0%{?rhel} >= 7
 export PYTHON_CFLAGS=`pkg-config --cflags python`
 export PYTHON_LIBS=`pkg-config --libs python`
+%else
+export PYTHON_CFLAGS=`python-config --cflags python`
+export PYTHON_LIBS=`python-config --libs python`
+%endif
 %endif
 
 # TODO: do we still need this? Perhaps some old patch touches


More information about the scm-commits mailing list