diff --git a/.pygobject3.metadata b/.pygobject3.metadata new file mode 100644 index 0000000..d361550 --- /dev/null +++ b/.pygobject3.metadata @@ -0,0 +1 @@ +c668e35c4f00d2736f404f1f0433327bdb64ea54 SOURCES/pygobject-3.8.2.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/ignore-more-pep8-errors.patch b/SOURCES/ignore-more-pep8-errors.patch new file mode 100644 index 0000000..bdcb9cb --- /dev/null +++ b/SOURCES/ignore-more-pep8-errors.patch @@ -0,0 +1,22 @@ +--- pygobject-3.7.92/tests/Makefile.in.ignore-more-pep8-errors 2013-03-18 13:55:04.000000000 +0100 ++++ pygobject-3.7.92/tests/Makefile.in 2013-03-20 21:34:25.815686535 +0100 +@@ -759,7 +759,7 @@ + @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi + @if test -z "$$SKIP_PEP8"; then \ + echo " CHECK PEP8"; \ +- if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi; \ ++ if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124,E127 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi; \ + fi + export `$(DBUS_LAUNCH)` && \ + $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd $(srcdir)/runtests.py; rc=$$?; \ +--- pygobject-3.7.92/tests/Makefile.am.ignore-more-pep8-errors 2013-02-27 21:14:17.000000000 +0100 ++++ pygobject-3.7.92/tests/Makefile.am 2013-03-20 21:34:25.815686535 +0100 +@@ -136,7 +136,7 @@ + @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi + @if test -z "$$SKIP_PEP8"; then \ + echo " CHECK PEP8"; \ +- if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi; \ ++ if type pep8 >/dev/null 2>&1; then pep8 --ignore=E501,E123,E124,E127 --repeat --show-source $(top_srcdir); else echo "skipped, pep8 not installed"; fi; \ + fi + export `$(DBUS_LAUNCH)` && \ + $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd $(srcdir)/runtests.py; rc=$$?; \ diff --git a/SOURCES/pygobject-3.3.4-known-failures.patch b/SOURCES/pygobject-3.3.4-known-failures.patch new file mode 100644 index 0000000..5d63873 --- /dev/null +++ b/SOURCES/pygobject-3.3.4-known-failures.patch @@ -0,0 +1,22 @@ +diff -up pygobject-3.3.4/tests/test_gdbus.py.known-failures pygobject-3.3.4/tests/test_gdbus.py +--- pygobject-3.3.4/tests/test_gdbus.py.known-failures 2012-08-09 11:51:21.707712400 -0400 ++++ pygobject-3.3.4/tests/test_gdbus.py 2012-08-09 11:51:38.663713384 -0400 +@@ -100,6 +100,7 @@ class TestGDBusClient(unittest.TestCase) + call_done, data) + main_loop.run() + ++ @unittest.expectedFailure + def test_python_calls_sync(self): + # single value return tuples get unboxed to the one element + result = self.dbus_proxy.ListNames('()') +diff -up pygobject-3.3.4/tests/test_gi.py.known-failures pygobject-3.3.4/tests/test_gi.py +--- pygobject-3.3.4/tests/test_gi.py.known-failures 2012-07-16 11:24:56.000000000 -0400 ++++ pygobject-3.3.4/tests/test_gi.py 2012-08-09 11:51:10.409711484 -0400 +@@ -2199,6 +2199,7 @@ class TestPropertiesObject(unittest.Test + + self.assertAlmostEqual(obj.props.some_double, 42.0) + ++ @unittest.expectedFailure + def test_strv(self): + self.assertEqual(self.obj.props.some_strv, []) + self.obj.props.some_strv = ['hello', 'world'] diff --git a/SOURCES/pygobject-3.8.0-known-failures.txt b/SOURCES/pygobject-3.8.0-known-failures.txt new file mode 100644 index 0000000..28468b4 --- /dev/null +++ b/SOURCES/pygobject-3.8.0-known-failures.txt @@ -0,0 +1,24 @@ +diff -up pygobject-3.8.0/tests/test_gi.py.rhbz924425 pygobject-3.8.0/tests/test_gi.py +--- pygobject-3.8.0/tests/test_gi.py.rhbz924425 2013-04-02 15:12:13.023806151 -0400 ++++ pygobject-3.8.0/tests/test_gi.py 2013-04-02 15:18:08.320781858 -0400 +@@ -1507,6 +1507,20 @@ class TestEnumVFuncResults(unittest.Test + def do_vfunc_out_enum(self): + return GIMarshallingTests.Enum.VALUE3 + ++ # Failing on ppc64: ++ # https://bugzilla.redhat.com/show_bug.cgi?id=924425#c7 ++ # ++ # ====================================================================== ++ # FAIL: test_vfunc_return_enum (test_gi.TestEnumVFuncResults) ++ # ---------------------------------------------------------------------- ++ # Traceback (most recent call last): ++ # File "/builddir/build/BUILD/pygobject-3.8.0/tests/test_gi.py", line 1512, in test_vfunc_return_enum ++ # self.assertEqual(tester.vfunc_return_enum(), GIMarshallingTests.Enum.VALUE2) ++ # AssertionError: != ++ # ---------------------------------------------------------------------- ++ # ++ # Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=697138 ++ @unittest.expectedFailure + def test_vfunc_return_enum(self): + tester = self.EnumTester() + self.assertEqual(tester.vfunc_return_enum(), GIMarshallingTests.Enum.VALUE2) diff --git a/SOURCES/test-list-marshalling.patch b/SOURCES/test-list-marshalling.patch new file mode 100644 index 0000000..30ed182 --- /dev/null +++ b/SOURCES/test-list-marshalling.patch @@ -0,0 +1,13 @@ +Index: pygobject-3.3.91/tests/test_overrides_gtk.py +=================================================================== +--- pygobject-3.3.91.orig/tests/test_overrides_gtk.py ++++ pygobject-3.3.91/tests/test_overrides_gtk.py +@@ -1553,3 +1553,8 @@ class TestTextBuffer(unittest.TestCase): + None) + self.assertEqual(start.get_offset(), 6) + self.assertEqual(end.get_offset(), 11) ++ ++ def test_rhbz842880(self): ++ # Regression test for https://bugzilla.redhat.com/show_bug.cgi?id=842880 ++ store = Gtk.ListStore(int, int) ++ store.append([1, 2]) diff --git a/SPECS/pygobject3.spec b/SPECS/pygobject3.spec new file mode 100644 index 0000000..4978ac8 --- /dev/null +++ b/SPECS/pygobject3.spec @@ -0,0 +1,424 @@ +# Last updated for version 3.7.5.1 +%define glib2_version 2.35.7 +%define gobject_introspection_version 1.34.2 +%define python2_version 2.3.5 + +%if 0%{?fedora} > 12 +%global with_python3 1 +%define python3_version 3.1 +%endif + +%if 1 + # Verbose build + %global verbosity V=1 +%else + # Quiet build + %global verbosity %{nil} +%endif + +%global with_check 1 + +### Abstract ### + +Name: pygobject3 +Version: 3.8.2 +Release: 2.1%{?dist} +License: LGPLv2+ and MIT +Group: Development/Languages +Summary: Python 2 bindings for GObject Introspection +URL: https://live.gnome.org/PyGObject +#VCS: git:git://git.gnome.org/pygobject +Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.8/pygobject-%{version}.tar.xz + +# Add these additional exclusions to the pep8 rules in "make check": +# E127 continuation line over-indented for visual indent +# Not yet sent upstream +Patch1: ignore-more-pep8-errors.patch + +# Mark some tests as known to fail; currently: +# +# On i686: +# ====================================================================== +# FAIL: test_strv (test_gi.TestPropertiesObject) +# ---------------------------------------------------------------------- +# Traceback (most recent call last): +# File "/builddir/build/BUILD/pygobject-3.3.4/tests/test_gi.py", line 2205, in test_strv +# self.assertEqual(self.obj.props.some_strv, ['hello', 'world']) +# AssertionError: Lists differ: ['hello'] != ['hello', 'world'] +# Second list contains 1 additional elements. +# First extra element 1: +# world +# - ['hello'] +# + ['hello', 'world'] +# ---------------------------------------------------------------------- +# +# Intermittently: +# ====================================================================== +# FAIL: test_python_calls_sync (test_gdbus.TestGDBusClient) +# ---------------------------------------------------------------------- +# Traceback (most recent call last): +# File "/builddir/build/BUILD/pygobject-3.3.4/tests/test_gdbus.py", line 140, in test_python_calls_sync +# self.assertTrue('Timeout' in str(e), str(e)) +# AssertionError: GDBus.Error:org.freedesktop.DBus.Error.NameHasNoOwner: Could not get PID of name '1': no such name +# ---------------------------------------------------------------------- +# +# Not yet sent upstream +Patch2: pygobject-3.3.4-known-failures.patch + +# Add regression test for rhbz#842880 +# Not yet sent upstream: +Patch3: test-list-marshalling.patch + +# Disable a test that still fails on ppc64 (see +# https://bugzilla.redhat.com/show_bug.cgi?id=924425#c7 ) +# Filed upstream as: +# https://bugzilla.gnome.org/show_bug.cgi?id=697138 +Patch5: pygobject-3.8.0-known-failures.txt + +### Build Dependencies ### + +BuildRequires: chrpath +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 + +Requires: %{name}-base = %{version}-%{release} + +# The cairo override module depends on this +Requires: pycairo + +%description +The %{name} package provides a convenient wrapper for the GObject library +for use in Python programs. + +%package base +Summary: Python 2 bindings for GObject Introspection base package +Group: Development/Languages +Requires: gobject-introspection >= %{gobject_introspection_version} + +%description base +This package provides the non-cairo specific bits of the GObject Introspection +library. + +%package devel +Summary: Development files for embedding PyGObject introspection support +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: glib2-devel +Requires: gobject-introspection-devel +Requires: pkgconfig + +%description devel +This package contains files required to embed PyGObject + +%if 0%{?with_python3} +%package -n python3-gobject +Summary: Python 3 bindings for GObject Introspection +Group: Development/Languages + +# The cairo override module depends on this +Requires: python3-cairo +Requires: gobject-introspection >= %{gobject_introspection_version} + +%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. + +%endif # with_python3 + +%prep +%setup -q -n pygobject-%{version} +%patch1 -p1 -b .ignore-more-pep8-errors +%patch2 -p1 -b .known-failures +%patch3 -p1 -b .test-list-marshalling +%patch5 -p1 + +%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} %{verbosity} + +%if 0%{?with_python3} +pushd %{py3dir} +PYTHON=%{__python3} +export PYTHON +%configure +make %{_smp_mflags} %{verbosity} +popd +%endif # with_python3 + +%install +%if 0%{?with_python3} +pushd %{py3dir} +PYTHON=%{__python3} +export PYTHON +make DESTDIR=$RPM_BUILD_ROOT install %{verbosity} +popd + +chrpath --delete $RPM_BUILD_ROOT%{python3_sitearch}/gi/{*.so,*/*.so} + +%endif # with_python3 + +make DESTDIR=$RPM_BUILD_ROOT install %{verbosity} +find $RPM_BUILD_ROOT -name '*.la' -delete +find $RPM_BUILD_ROOT -name '*.a' -delete + +chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/gi/{*.so,*/*.so} + +# 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 +# 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 %{verbosity} +popd +%endif # with_python3 + +xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} + +%endif # with_check + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(644, root, root, 755) +%{python_sitearch}/gi/_gi_cairo.so + +%files base +%defattr(644, root, root, 755) +%doc AUTHORS NEWS README COPYING +%{_libdir}/libpyglib-gi-2.0-python.so* +%dir %{python_sitearch}/gi +%{python_sitearch}/gi/* +%exclude %{python_sitearch}/gi/_gi_cairo.so +%{python_sitearch}/pygobject-*.egg-info +%{python_sitearch}/pygtkcompat/ + +%files devel +%defattr(644, root, root, 755) +%doc _docs/* +%dir %{_includedir}/pygobject-3.0/ +%{_includedir}/pygobject-3.0/pygobject.h +%{_libdir}/pkgconfig/pygobject-3.0.pc + +%if 0%{?with_python3} +%files -n python3-gobject +%defattr(644, root, root, 755) +%doc AUTHORS NEWS README COPYING +%{_libdir}/libpyglib-gi-2.0-python3.so* +%dir %{python3_sitearch}/gi +%{python3_sitearch}/gi/* +%{python3_sitearch}/pygobject-*.egg-info +%{python3_sitearch}/pygtkcompat/ + +%endif # with_python3 + +%changelog +* Thu Sep 5 2013 Paul W. Frields - 3.8.2-2.1 +- Rebuild for ppc64 (rhbz #978762) + +* Sun Jun 02 2013 Kalev Lember - 3.8.2-2 +- Disable pyflakes tests to avoid failures with too new pyflakes 0.7.2 + +* Mon May 13 2013 Richard Hughes - 3.8.2-1 +- Update to 3.8.2 + +* Thu Apr 25 2013 Peter Robinson 3.8.1-2 +- Add upstream patch to fix Sugar (RHBZ 947538) + +* Mon Apr 15 2013 Kalev Lember - 3.8.1-1 +- Update to 3.8.1 + +* Tue Apr 2 2013 David Malcolm - 3.8.0-2 +- add workarounds for ppc64 (rhbz#924425) + +* Tue Mar 26 2013 Kalev Lember - 3.8.0-1 +- Update to 3.8.0 + +* Wed Mar 20 2013 Kalev Lember - 3.7.92-1 +- Update to 3.7.92 + +* Thu Mar 7 2013 Matthias Clasen - 3.7.91-1 +- Update to 3.7.91 + +* Thu Feb 21 2013 Kalev Lember - 3.7.90-1 +- Update to 3.7.90 + +* Wed Feb 06 2013 Kalev Lember - 3.7.5.1-1 +- Update to 3.7.5.1 +- Re-enable tests + +* Wed Jan 16 2013 Matthias Clasen - 3.7.4-1 +- Update to 3.7.4 + +* Fri Dec 28 2012 Dan Horák - 3.7.3-2 +- Fix GBytes test (gnome#690837) + +* Thu Dec 20 2012 Kalev Lember - 3.7.3-1 +- Update to 3.7.3 +- Drop upstreamed patches; rebase the ignore-more-pep8-errors patch + +* Thu Dec 13 2012 Ray Strode 3.7.1-3 +- Split non-cairo parts into a subpackage + +* Mon Nov 12 2012 Kalev Lember - 3.7.1-2 +- Remove lib64 rpaths (#817701) +- Move code examples to the -devel subpackage and fix the multilib + conflict (#831434) + +* Fri Nov 09 2012 Kalev Lember - 3.7.1-1 +- Update to 3.7.1 + +* Tue Nov 6 2012 Daniel Drake - 3.4.1.1-2 +- Upstream fix for property lookup; needed for basic Sugar operation. + +* Wed Oct 17 2012 Kalev Lember - 3.4.1.1-1 +- Update to 3.4.1.1 + +* Thu Sep 13 2012 Daniel Drake - 3.3.91-1 +- Latest version; upstreamed patches dropped + +* Wed Aug 15 2012 David Malcolm - 3.3.4-9 +- avoid dragging pyflakes and python-pep8 into RHEL (patch 7) + +* Fri Aug 10 2012 David Malcolm - 3.3.4-8 +- add endianness patch (rhbz#841596; attachment 603634) + +* Fri Aug 10 2012 David Malcolm - 3.3.4-7 +- update endianness patch for rhbz#841596 (to attachment 603367) + +* Thu Aug 9 2012 David Malcolm - 3.3.4-6 +- fix issues on big-endian 64-bit machines (rhbz#841596, rhbz#842880) + +* Thu Aug 9 2012 David Malcolm - 3.3.4-5 +- use xvfb-run in selftests; update known failures + +* Wed Aug 8 2012 David Malcolm - 3.3.4-4 +- add a %%check check; add V=1 to all make invocations + +* Sat Aug 04 2012 David Malcolm - 3.3.4-3 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Fri Aug 3 2012 David Malcolm - 3.3.4-2 +- remove rhel logic from with_python3 conditional + +* Tue Jul 17 2012 Richard Hughes - 3.3.4-1 +- Update to 3.3.4 + +* Tue Jun 26 2012 David Malcolm - 3.3.3.1-2 +- fix a segfault when dealing with mismatched .so/typelib files + +* Mon Jun 25 2012 Peter Robinson - 3.3.3.1-1 +- Update to 3.3.3.1 + +* Tue Jun 19 2012 Kalev Lember - 3.3.2-1 +- Update to 3.3.2 + +* Sat May 05 2012 Kalev Lember - 3.3.1-1 +- Update to 3.3.1 +- Dropped the now unneeded -lm patch + +* Tue Mar 27 2012 Kalev Lember - 3.2.0-1 +- Update to 3.2.0 + +* Thu Mar 22 2012 Matthias Clasen - 3.1.93-1 +- Update to 3.1.93 + +* Wed Mar 21 2012 Kalev Lember - 3.1.92-1 +- Update to 3.1.92 + +* Sun Feb 26 2012 Matthias Clasen - 3.1.1-1 +- Update to 3.1.1 + +* Tue Feb 7 2012 Matthias Clasen - 3.1.0-1 +- Update to 3.1.0 + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 20 2011 Ignacio Casal Quinteiro - 3.0.3-1 +- udpate to 3.0.3 + +* Sat Oct 22 2011 Ignacio Casal Quinteiro - 3.0.2-1 +- udpate to 3.0.2 + +* Fri Sep 30 2011 Ignacio Casal Quinteiro - 3.0.1-1 +- udpate to 3.0.1 + +* Tue Sep 20 2011 Matthias Clasen - 3.0.0-1 +- Update to 3.0.0 + +* Thu Sep 15 2011 John (J5) Palmieri - 2.90.4-1 +- update to 2.90.4 +- get rid of packaging cruft that is taken care of by upstream now + +* 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 +- remove some old requires + +* Thu 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 + +* Thu Aug 18 2011 John (J5) Palmieri - 2.90.2-1 +- Initial package