diff --git a/pygobject3.spec b/pygobject3.spec index 7758b40..3f55bfb 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -12,16 +12,17 @@ %global with_check 0 Name: pygobject3 -Version: 3.28.3 -Release: 3%{?dist} +Version: 3.29.2 +Release: 1%{?dist} Summary: Python bindings for GObject Introspection License: LGPLv2+ and MIT URL: https://wiki.gnome.org/Projects/PyGObject -Source0: https://download.gnome.org/sources/pygobject/3.28/pygobject-%{version}.tar.xz +Source0: https://download.gnome.org/sources/pygobject/3.29/pygobject-%{version}.tar.xz BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} +BuildRequires: meson BuildRequires: python2-devel >= %{python2_version} BuildRequires: python2-cairo-devel >= %{pycairo_version} %if 0%{?with_python3} @@ -123,46 +124,28 @@ This package contains files required to embed PyGObject %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %endif # with_python3 -find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' - %build -PYTHON=%{__python} -export PYTHON -%configure -make %{?_smp_mflags} V=1 +%meson -Dpython=%{__python2} +%meson_build %if 0%{?with_python3} pushd %{py3dir} -PYTHON=%{__python3} -export PYTHON -%configure -make %{?_smp_mflags} V=1 +%meson -Dpython=%{__python3} +%meson_build popd %endif # with_python3 %install +%meson_install + %if 0%{?with_python3} pushd %{py3dir} -PYTHON=%{__python3} -export PYTHON -%make_install +%meson_install popd - %endif # with_python3 -%make_install -find $RPM_BUILD_ROOT -name '*.la' -delete - -# Don't include makefiles in the installed docs, in order to avoid creating -# multilib conflicts -rm -rf _docs -mkdir _docs -cp -a examples _docs -rm _docs/examples/Makefile* - %check %if %{with_check} # Run the selftests under a temporary xvfb X server (so that they can @@ -192,11 +175,12 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 %files -n python2-gobject-base %license COPYING %doc NEWS -%dir %{python_sitearch}/gi +%dir %{python2_sitearch}/gi %{python2_sitearch}/gi/* -%exclude %{python_sitearch}/gi/_gi_cairo.so -%{python2_sitearch}/pygobject-*.egg-info +%exclude %{python2_sitearch}/gi/_gi_cairo.so %{python2_sitearch}/pygtkcompat/ +%dir %{python2_sitelib}/gi +%{python2_sitelib}/gi/pygobject-*.egg-info %if 0%{?with_python3} %files -n python3-gobject @@ -208,17 +192,21 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 %dir %{python3_sitearch}/gi %{python3_sitearch}/gi/* %exclude %{python3_sitearch}/gi/_gi_cairo*.so -%{python3_sitearch}/pygobject-*.egg-info %{python3_sitearch}/pygtkcompat/ +%dir %{python3_sitelib}/gi +%{python3_sitelib}/gi/pygobject-*.egg-info %endif # with_python3 %files devel -%doc _docs/* +%doc examples/ %dir %{_includedir}/pygobject-3.0/ %{_includedir}/pygobject-3.0/pygobject.h %{_libdir}/pkgconfig/pygobject-3.0.pc %changelog +* Mon Aug 13 2018 Kalev Lember - 3.29.2-1 +- Update to 3.29.2 + * Fri Jul 13 2018 Fedora Release Engineering - 3.28.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 6807d09..977afb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pygobject-3.28.3.tar.xz) = 0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d +SHA512 (pygobject-3.29.2.tar.xz) = 59a62617b9e23f5232fc57765a8a63a7b97db05d92b0eb64e103fa62878f7d079350a19bad0e433fa7ec9446cf9740ff8fd7338f09201be4e5a0da9d69cf0d07