Compare commits

..

No commits in common. "f13e7a350c17d893986ce6ff23e3a33ebd639f8a" and "9b12ec0853781becab12c238c337a00013969d0b" have entirely different histories.

5 changed files with 48 additions and 55 deletions

BIN
libpeas-1.22.0.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,28 +1,19 @@
%global apiver 1.0
Name: libpeas Name: libpeas
Version: 1.36.0 Version: 1.22.0
Release: 1 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.36/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/1.22/%{name}-%{version}.tar.xz
Patch0000: python3.8-fix.patch
BuildRequires: chrpath gcc gettext gi-docgen meson
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gladeui-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(pygobject-3.0)
BuildRequires: python3-devel
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(gtk+-3.0), pkgconfig(pygobject-3.0), python3-devel, gnome-common
Requires: python3-gobject Requires: python3-gobject
Provides: %{name}-gtk%{?_isa} Provides: %{name}-gtk%{?_isa} %{name}-gtk
Obsoletes: %{name}-gtk Obsoletes: %{name}-gtk
provides: %{name}-loader-python3%{?_isa} provides: %{name}-loader-python3%{?_isa} %{name}-loader-python3
Obsoletes: %{name}-loader-python3 Obsoletes: %{name}-loader-python3
Provides: %{name}-loader-python = %{version}-%{release} Provides: %{name}-loader-python = %{version}-%{release}
Obsoletes: %{name}-loader-python < %{version}-%{release} Obsoletes: %{name}-loader-python < %{version}-%{release}
@ -44,60 +35,49 @@ applications that use libpeas.
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
autoreconf -fi
%build %build
%meson \ %configure --disable-silent-rules --disable-python2
-Ddemos=false \ %make_build
-Dvapi=true \
-Dgtk_doc=true
%meson_build
%install %install
%meson_install %make_install
%delete_la_and_a find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -print -exec rm -f {} ';'
chrpath -d $RPM_BUILD_ROOT%{_libdir}/libpeas-%{apiver}/loaders/libpython3loader.so chrpath -d $RPM_BUILD_ROOT%{_bindir}/peas-demo
chrpath -d $RPM_BUILD_ROOT%{_libdir}/libpeas-gtk-%{apiver}.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}/peas-demo/plugins/helloworld/libhelloworld.so
chrpath -d $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.so
%find_lang libpeas-1.0 %find_lang libpeas
%ldconfig_scriptlets %ldconfig_scriptlets
%files -f libpeas-1.0.lang %files -f libpeas.lang
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
%license COPYING %license COPYING
%{_libdir}/libpeas-*.so.0* %{_libdir}/libpeas*.so*
%dir %{_libdir}/libpeas-%{apiver}/loaders %dir %{_libdir}/libpeas-1.0/
%dir %{_libdir}/libpeas-1.0/loaders
%{_libdir}/libpeas-1.0/loaders/*.so*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/*.typelib %{_libdir}/girepository-1.0/*.typelib
%{_datadir}/icons/hicolor/*/actions/libpeas-plugin.* %{_datadir}/icons/hicolor/*/actions/libpeas-plugin.*
%files devel %files devel
%{_includedir}/libpeas-%{apiver}/ %{_bindir}/peas-demo
%{_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/html/
%{_datadir}/gtk-doc/html/libpeas/
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/*.gir %{_datadir}/gir-1.0/*.gir
%{_libdir}/libpeas-%{apiver}.so
%{_libdir}/libpeas-gtk-%{apiver}.so
%{_libdir}/libpeas-%{apiver}/loaders/libpython3loader.so
%{_docdir}/libpeas-1.0
%{_docdir}/libpeas-gtk-1.0
%changelog %changelog
* Fri Nov 17 2023 lwg <liweiganga@uniontech.com> - 1.36.0-1
- update to version 1.36.0
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.34.0-1
- Update to 1.34.0
* Thu Apr 21 2022 dillon chen <dillon.chen@gmail.com> - 1.32.0-1
- Update to 1.32.0
* 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,4 +1,4 @@
version_control: gitlab.gnome version_control: gitlab.gnome
src_repo: libpeas src_repo: libpeas
tag_prefix: libpeas- tag_prefix: libpeas-
separator: . seperator: .

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)