diff --git a/SPECS/pygobject3.spec b/SPECS/pygobject3.spec index 77970b7..8ce6a58 100644 --- a/SPECS/pygobject3.spec +++ b/SPECS/pygobject3.spec @@ -2,160 +2,111 @@ %define glib2_version 2.38.0 %define gobject_introspection_version 1.46.0 %define python2_version 2.7 -%global with_python3 1 %define python3_version 3.6 -%global with_check 0 - -%global _smp_mflags -j1 Name: pygobject3 -Version: 3.22.0 -Release: 1%{?dist}.1 +Version: 3.24.0 +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.22/pygobject-%{version}.tar.xz - -# https://bugzilla.redhat.com/1247996 -# which reverts https://bugzilla.gnome.org/709183 -Patch1: pygobject-3.22.0-allow-static-module-import.patch - +Source0: https://download.gnome.org/sources/pygobject/3.24/pygobject-%{version}.tar.xz BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} BuildRequires: python2-devel >= %{python2_version} -%if 0%{?with_python3} BuildRequires: python3-devel >= %{python3_version} BuildRequires: python3-cairo-devel -%endif # if with_python3 - BuildRequires: cairo-gobject-devel BuildRequires: pycairo-devel -# Required by the upstream selftest suite: -%if %{with_check} -%if 0%{?fedora} -# Temporarily disabled pyflakes tests to avoid the build failing due to too new -# pyflakes 0.7.2 in F19 -# https://bugzilla.gnome.org/show_bug.cgi?id=701009 -#BuildRequires: pyflakes -BuildRequires: python-pep8 -%endif -## for the Gdk and Gtk typelibs, used during the test suite: -BuildRequires: gtk3 -## for xvfb-run: -BuildRequires: xorg-x11-server-Xvfb -BuildRequires: dejavu-sans-fonts -BuildRequires: dejavu-sans-mono-fonts -BuildRequires: dejavu-serif-fonts -## for dbus-launch, used by test_gdbus: -BuildRequires: dbus-x11 -%endif # with_check %description The %{name} package provides a convenient wrapper for the GObject library for use in Python programs. -%package -n python-gobject + +%package -n python-gobject Summary: Python 2 bindings for GObject Introspection Requires: python-gobject-base%{?_isa} = %{version}-%{release} # The cairo override module depends on this Requires: pycairo%{?_isa} - Obsoletes: %{name} < 3.17.90-2 Provides: %{name} = %{version}-%{release} Provides: %{name}%{?_isa} = %{version}-%{release} - +Provides: python2-gobject %description -n python-gobject The python-gobject package provides a convenient wrapper for the GObject library and and other libraries that are compatible with GObject Introspection, for use in Python 2 programs. + %package -n python-gobject-base Summary: Python 2 bindings for GObject Introspection base package Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} - Obsoletes: %{name}-base < 3.17.90-2 Provides: %{name}-base = %{version}-%{release} Provides: %{name}-base%{?_isa} = %{version}-%{release} - %description -n python-gobject-base This package provides the non-cairo specific bits of the GObject Introspection library. -%if 0%{?with_python3} + %package -n python3-gobject Summary: Python 3 bindings for GObject Introspection Requires: python3-gobject-base%{?_isa} = %{version}-%{release} # The cairo override module depends on this Requires: python3-cairo%{?_isa} - %description -n python3-gobject The python3-gobject package provides a convenient wrapper for the GObject library and and other libraries that are compatible with GObject Introspection, for use in Python 3 programs. + %package -n python3-gobject-base Summary: Python 3 bindings for GObject Introspection base package Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} - %description -n python3-gobject-base This package provides the non-cairo specific bits of the GObject Introspection library. -%endif # with_python3 - %package devel Summary: Development files for embedding PyGObject introspection support Requires: python-gobject%{?_isa} = %{version}-%{release} -%if 0%{?with_python3} Requires: python3-gobject%{?_isa} = %{version}-%{release} -%endif Requires: gobject-introspection-devel%{?_isa} - %description devel This package contains files required to embed PyGObject + %prep %setup -q -n pygobject-%{version} -%patch1 -p1 -b .allow-static-module-import - -%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 - -%if 0%{?with_python3} pushd %{py3dir} PYTHON=%{__python3} export PYTHON %configure make %{?_smp_mflags} V=1 popd -%endif # with_python3 + %install -%if 0%{?with_python3} pushd %{py3dir} PYTHON=%{__python3} export PYTHON %make_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 @@ -163,32 +114,11 @@ 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 -# initialize Gdk etc): - -# FIXME: disabled for python3 -# Currently this fails with python3 with: -# File "/builddir/build/BUILD/python3-pygobject3-3.3.4-4.fc19/gi/__init__.py", line 23, in -# from ._gi import _API, Repository -#ValueError: level must be >= 0 -# Reported upstream as http://bugs.python.org/issue15610 -%if 0 -pushd %{py3dir} -PYTHON=%{__python3} -export PYTHON -xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 -popd -%endif # with_python3 - -xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 - -%endif # with_check %files -n python-gobject %{python_sitearch}/gi/_gi_cairo.so + %files -n python-gobject-base %license COPYING %doc AUTHORS NEWS README @@ -198,10 +128,10 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 %{python_sitearch}/pygobject-*.egg-info %{python_sitearch}/pygtkcompat/ -%if 0%{?with_python3} %files -n python3-gobject %{python3_sitearch}/gi/_gi_cairo*.so + %files -n python3-gobject-base %license COPYING %doc AUTHORS NEWS README @@ -210,7 +140,7 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 %exclude %{python3_sitearch}/gi/_gi_cairo*.so %{python3_sitearch}/pygobject-*.egg-info %{python3_sitearch}/pygtkcompat/ -%endif # with_python3 + %files devel %doc _docs/* @@ -218,20 +148,102 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 %{_includedir}/pygobject-3.0/pygobject.h %{_libdir}/pkgconfig/pygobject-3.0.pc + %changelog -* Thu Nov 09 2017 John Francini - 3.22.0-1.1 -- Bump release to allow rebuild to fix BZ#1510160 +* Tue Mar 21 2017 Kalev Lember - 3.24.0-1 +- Update to 3.24.0 + +* Sat Feb 11 2017 Fedora Release Engineering - 3.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 12 2016 Charalampos Stratakis - 3.22.0-2 +- Rebuild for Python 3.6 * Mon Sep 19 2016 Kalev Lember - 3.22.0-1 - Update to 3.22.0 -- Resolves: #1387039 -* Tue Sep 15 2015 Matthew Barnes - 3.14.0-3 -- Allow importing static modules to fix RHEL7 rebase regressions +* Sun Sep 11 2016 Kalev Lember - 3.21.92-1 +- Update to 3.21.92 + +* Fri Aug 26 2016 Kalev Lember - 3.21.91-1 +- Update to 3.21.91 + +* Tue Aug 23 2016 Kalev Lember - 3.21.1-0.1.git395779e +- Update to 3.21.1 git snapshot + +* Tue Jul 19 2016 Fedora Release Engineering - 3.21.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue May 03 2016 Kalev Lember - 3.21.0-1 +- Update to 3.21.0 + +* Tue Mar 22 2016 Kalev Lember - 3.20.0-1 +- Update to 3.20.0 + +* Wed Mar 16 2016 Kalev Lember - 3.19.92-1 +- Update to 3.19.92 + +* Wed Mar 02 2016 Richard Hughes - 3.19.91-1 +- Update to 3.19.91 + +* Mon Feb 29 2016 Richard Hughes - 3.19.90-1 +- Update to 3.19.90 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.19.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 03 2015 Robert Kuska - 3.19.2-2 +- Rebuilt for Python3.5 rebuild + +* Sun Nov 01 2015 Kalev Lember - 3.19.2-1 +- Update to 3.19.2 + +* Sat Oct 24 2015 Kalev Lember - 3.18.2-1 +- Update to 3.18.2 + +* Sat Oct 24 2015 Kalev Lember - 3.18.1-1 +- Update to 3.18.1 +- Update project URL and Source download location + +* Mon Oct 19 2015 Kalev Lember - 3.18.0-2 +- Backport a fix for Gdk.rectangle_intersect/rectangle_union compatibility + (#1269901) + +* Tue Sep 22 2015 Kalev Lember - 3.18.0-1 +- Update to 3.18.0 + +* Sat Aug 22 2015 Kalev Lember - 3.17.90-2 +- Rename Python 2 subpackage to python-gobject for consistency with the + python3-gobject package + +* Thu Aug 20 2015 Kalev Lember - 3.17.90-1 +- Update to 3.17.90 +- Use make_install macro +- Use license macro for COPYING + +* Tue Jun 30 2015 Kalev Lember - 3.17.1-3 +- Split non-cairo parts python3-gobject into a subpackage + +* Thu Jun 18 2015 Fedora Release Engineering - 3.17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Jun 15 2015 Kalev Lember - 3.17.1-1 +- Update to 3.17.1 + +* Wed Jun 03 2015 Kalev Lember - 3.16.1-2 +- Backport a patch for GdkRectangle changes in gtk+ 3.17.2 + +* Tue Apr 14 2015 Kalev Lember - 3.16.1-1 +- Update to 3.16.1 + +* Tue Mar 24 2015 Kalev Lember - 3.16.0-1 +- Update to 3.16.0 + +* Thu Mar 05 2015 Kalev Lember - 3.15.91-1 +- Update to 3.15.91 -* Fri May 22 2015 Rui Matos - 3.14.0-2 -- Add patch to fix a coverity issue - https://bugzilla.gnome.org/show_bug.cgi?id=749698 +* Sat Feb 21 2015 Kalev Lember - 3.15.0-1 +- Update to 3.15.0 * Mon Sep 22 2014 Kalev Lember - 3.14.0-1 - Update to 3.14.0 @@ -463,10 +475,10 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1 * Wed Aug 31 2011 Ignacio Casal Quinteiro - 2.90.3-1 - udpate to 2.90.3 -* Thu Aug 22 2011 John (J5) Palmieri - 2.90.2-3 +* Mon Aug 22 2011 John (J5) Palmieri - 2.90.2-3 - remove some old requires -* Thu Aug 19 2011 John (J5) Palmieri - 2.90.2-2 +* Fri Aug 19 2011 John (J5) Palmieri - 2.90.2-2 - fix up issues uncovered during package review - disable docs because they still reference the static bindings and upstream is working on new documentation