This commit is contained in:
wang_yue111 2020-06-22 18:19:03 +08:00
parent 1b45ef6eee
commit 1cc32b6330
2 changed files with 22 additions and 4 deletions

View File

@ -1,14 +1,15 @@
Name: libpeas Name: libpeas
Version: 1.22.0 Version: 1.22.0
Release: 10 Release: 11
Summary: Gobject-based plugins engine Summary: Gobject-based plugins engine
License: LGPLv2+ License: LGPLv2+
URL: https://wiki.gnome.org/Projects/Libpeas URL: https://wiki.gnome.org/Projects/Libpeas
Source0: https://download.gnome.org/sources/%{name}/1.22/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/1.22/%{name}-%{version}.tar.xz
Patch0000: python3.8-fix.patch
BuildRequires: chrpath, intltool, pkgconfig(gio-2.0), pkgconfig(gladeui-2.0), pkgconfig(glib-2.0) BuildRequires: chrpath, intltool, pkgconfig(gio-2.0), pkgconfig(gladeui-2.0), pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gmodule-2.0), pkgconfig(gobject-2.0), pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gmodule-2.0), pkgconfig(gobject-2.0), pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0), pkgconfig(pygobject-3.0), python3-devel BuildRequires: pkgconfig(gtk+-3.0), pkgconfig(pygobject-3.0), python3-devel, gnome-common
Requires: python3-gobject Requires: python3-gobject
Provides: %{name}-gtk%{?_isa} %{name}-gtk Provides: %{name}-gtk%{?_isa} %{name}-gtk
Obsoletes: %{name}-gtk Obsoletes: %{name}-gtk
@ -33,10 +34,11 @@ This package includes libraries and header files for developing
applications that use libpeas. applications that use libpeas.
%prep %prep
%autosetup %autosetup -n %{name}-%{version} -p1
autoreconf -fi
%build %build
%configure --disable-silent-rules %configure --disable-silent-rules --disable-python2
%make_build %make_build
%install %install
@ -76,5 +78,8 @@ chrpath -d $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.
%{_datadir}/gir-1.0/*.gir %{_datadir}/gir-1.0/*.gir
%changelog %changelog
* Mon Jun 22 2020 Zhanghua <zhanghua40@huawei.com> - 1.22.0-11
- Fix python3.8 complied error
* Thu Nov 28 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-10 * Thu Nov 28 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-10
- Package init - Package init

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)