diff --git a/.gitignore b/.gitignore index 6e69c8c..877a7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /libpeas-1.21.0-bcc8644.tar.xz /libpeas-1.21.0.tar.xz /libpeas-1.22.0.tar.xz +/libpeas-1.23.90.1.tar.xz diff --git a/libpeas.spec b/libpeas.spec index 2113284..8e079d7 100644 --- a/libpeas.spec +++ b/libpeas.spec @@ -11,22 +11,18 @@ %global apiver 1.0 Name: libpeas -Version: 1.22.0 -Release: 14%{?dist} +Version: 1.23.90.1 +Release: 1%{?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 +Source0: https://download.gnome.org/sources/%{name}/1.23/%{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: gettext +BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gladeui-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -76,31 +72,22 @@ that are needed to write applications that use libpeas. %prep %autosetup -p1 -autoreconf -fi %build -%configure --disable-silent-rules --disable-python2 -%make_build +%meson \ + -Dvapi=true \ + -Dgtk_doc=true + +%meson_build %install -%make_install +%meson_install -find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -print -delete - -# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/peas-demo -%if %{use_python3} -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libpython3loader.so -%endif -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-gtk-1.0.so -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/helloworld/libhelloworld.so -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.so - -%find_lang libpeas +%find_lang libpeas-1.0 %ldconfig_scriptlets -%files -f libpeas.lang +%files -f libpeas-1.0.lang %doc AUTHORS NEWS README %license COPYING %{_libdir}/libpeas-%{apiver}.so.* @@ -120,9 +107,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecon %endif %files devel -%{_bindir}/peas-demo %{_includedir}/libpeas-%{apiver}/ -%{_libdir}/peas-demo/ %dir %{_datadir}/gtk-doc/ %dir %{_datadir}/gtk-doc/html/ %{_datadir}/gtk-doc/html/libpeas/ @@ -136,6 +121,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecon %{_datadir}/glade/catalogs/libpeas-gtk.xml %changelog +* Tue Aug 20 2019 Kalev Lember - 1.23.90.1-1 +- Update to 1.23.90.1 +- Switch to the meson build system + * Mon Aug 19 2019 Miro HronĨok - 1.22.0-14 - Rebuilt for Python 3.8 diff --git a/sources b/sources index fbccf30..6a4bea7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpeas-1.22.0.tar.xz) = 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91 +SHA512 (libpeas-1.23.90.1.tar.xz) = 91804a25aa39dd9d9f888170eb60cb06418ec96244619fdf6072d9b33a02a7d22946d6e2df07e6fdc4d394236165cf86c4686305d914f5edc47637910c99bb7d