Upgrade to 1.28.0

Update Version, Release, Source0, BuildRequires
Use meson rebuild, delete python3.8-fix.patch that for autoreconf
This commit is contained in:
weijin-deng 2021-06-11 16:06:25 +08:00
parent 6180fbc490
commit 5c987a2363
4 changed files with 21 additions and 31 deletions

Binary file not shown.

BIN
libpeas-1.28.0.tar.xz Normal file

Binary file not shown.

View File

@ -1,15 +1,14 @@
Name: libpeas Name: libpeas
Version: 1.22.0 Version: 1.28.0
Release: 12 Release: 1
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.28/%{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) meson
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) gcc
BuildRequires: pkgconfig(gtk+-3.0), pkgconfig(pygobject-3.0), python3-devel, gnome-common BuildRequires: pkgconfig(gtk+-3.0), pkgconfig(pygobject-3.0), python3-devel, gnome-common gettext gtk-doc
Requires: python3-gobject Requires: python3-gobject
Provides: %{name}-gtk%{?_isa} %{name}-gtk Provides: %{name}-gtk%{?_isa} %{name}-gtk
Obsoletes: %{name}-gtk Obsoletes: %{name}-gtk
@ -35,26 +34,27 @@ applications that use libpeas.
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
autoreconf -fi
%build %build
%configure --disable-silent-rules --disable-python2 %meson \
%make_build -Ddemos=false \
-Dvapi=true \
-Dgtk_doc=true
%meson_build
%install %install
%make_install %meson_install
find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -print -exec rm -f {} ';' find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -print -exec rm -f {} ';'
chrpath -d $RPM_BUILD_ROOT%{_bindir}/peas-demo
chrpath -d $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libpython3loader.so chrpath -d $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libpython3loader.so
chrpath -d $RPM_BUILD_ROOT%{_libdir}/libpeas-gtk-1.0.so chrpath -d $RPM_BUILD_ROOT%{_libdir}/libpeas-gtk-1.0.so
chrpath -d $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/helloworld/libhelloworld.so
chrpath -d $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.so
%find_lang libpeas %find_lang libpeas-1.0
%ldconfig_scriptlets %ldconfig_scriptlets
%files -f libpeas.lang %files -f libpeas-1.0.lang
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
%license COPYING %license COPYING
%{_libdir}/libpeas*.so* %{_libdir}/libpeas*.so*
@ -66,9 +66,7 @@ chrpath -d $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.
%{_datadir}/icons/hicolor/*/actions/libpeas-plugin.* %{_datadir}/icons/hicolor/*/actions/libpeas-plugin.*
%files devel %files devel
%{_bindir}/peas-demo
%{_includedir}/libpeas-1.0/ %{_includedir}/libpeas-1.0/
%{_libdir}/peas-demo/
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/glade/catalogs/libpeas-gtk.xml %{_datadir}/glade/catalogs/libpeas-gtk.xml
%dir %{_datadir}/gtk-doc/ %dir %{_datadir}/gtk-doc/
@ -78,6 +76,11 @@ 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 7 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.28.0-1
- Upgrade to 1.28.0
- Update Version, Release, Source0, BuildRequires
- Use meson rebuild, delete python3.8-fix.patch that for autoreconf
* Mon Jun 22 2020 Zhanghua <zhanghua40@huawei.com> - 1.22.0-11 * Mon Jun 22 2020 Zhanghua <zhanghua40@huawei.com> - 1.22.0-11
- Fix python3.8 complied error - Fix python3.8 complied error

View File

@ -1,13 +0,0 @@
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)