Fix FTBFS with Python 3.8

This commit is contained in:
Charalampos Stratakis 2019-05-31 02:09:25 +02:00
parent 9d26a23aca
commit ac61e5293e
2 changed files with 23 additions and 2 deletions

View File

@ -12,16 +12,20 @@
Name: libpeas
Version: 1.22.0
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Plug-ins implementation convenience library
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/Libpeas
Source0: https://download.gnome.org/sources/%{name}/1.22/%{name}-%{version}.tar.xz
# Upstream issue: https://gitlab.gnome.org/GNOME/libpeas/issues/28
Patch0: python3.8-fix.patch
BuildRequires: chrpath
BuildRequires: gcc
BuildRequires: intltool
BuildRequires: gnome-common
BuildRequires: make
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gladeui-2.0)
@ -71,7 +75,8 @@ This package contains development libraries and header files
that are needed to write applications that use libpeas.
%prep
%autosetup
%autosetup -p1
autoreconf -fi
%build
%configure --disable-silent-rules
@ -131,6 +136,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecon
%{_datadir}/glade/catalogs/libpeas-gtk.xml
%changelog
* Fri May 31 2019 Charalampos Stratakis <cstratak@redhat.com> - 1.22.0-11
- Fix FTBFS with Python 3.8 (#1715665)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

13
python3.8-fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index bd561e2..45ac643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,7 +442,7 @@ else
found_python3=yes
PYTHON3_BIN="$PYTHON"
PYTHON3_CFLAGS=`${PYTHON3_CONFIG} --includes`
- PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs`
+ PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs --embed` || PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs`
PYTHON3_LDFLAGS=`${PYTHON3_CONFIG} --ldflags`
AC_SUBST(PYTHON3_BIN)
AC_SUBST(PYTHON3_CFLAGS)