From 32e0c9f12de82389ec3ffb3c4598aa562194080a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 17 Oct 2012 19:57:31 +0200 Subject: [PATCH] Update to 3.4.1.1 --- ignore-more-pep8-errors.patch | 28 ++++++++++++---------------- pygobject3.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ignore-more-pep8-errors.patch b/ignore-more-pep8-errors.patch index ba358d4..627453b 100644 --- a/ignore-more-pep8-errors.patch +++ b/ignore-more-pep8-errors.patch @@ -1,26 +1,22 @@ -Index: pygobject-3.3.91/tests/Makefile.am -=================================================================== ---- pygobject-3.3.91.orig/tests/Makefile.am -+++ pygobject-3.3.91/tests/Makefile.am -@@ -118,7 +118,7 @@ check-local: $(LTLIBRARIES:.la=.so) Regr +--- pygobject-3.4.1/tests/Makefile.in.ignore-more-pep8-errors 2012-10-15 07:54:06.000000000 +0200 ++++ pygobject-3.4.1/tests/Makefile.in 2012-10-17 18:20:43.199988314 +0200 +@@ -745,7 +745,7 @@ @echo " CHECK Pyflakes" @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi @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 - $(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py - - check.gdb: -Index: pygobject-3.3.91/tests/Makefile.in -=================================================================== ---- pygobject-3.3.91.orig/tests/Makefile.in -+++ pygobject-3.3.91/tests/Makefile.in -@@ -736,7 +736,7 @@ check-local: $(LTLIBRARIES:.la=.so) Regr + export `$(DBUS_LAUNCH)` && \ + $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py; rc=$$?; \ + kill $$DBUS_SESSION_BUS_PID; \ +--- pygobject-3.4.1/tests/Makefile.am.ignore-more-pep8-errors 2012-10-15 07:39:55.000000000 +0200 ++++ pygobject-3.4.1/tests/Makefile.am 2012-10-17 18:20:43.199988314 +0200 +@@ -127,7 +127,7 @@ @echo " CHECK Pyflakes" @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi @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 - $(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py - - check.gdb: + export `$(DBUS_LAUNCH)` && \ + $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py; rc=$$?; \ + kill $$DBUS_SESSION_BUS_PID; \ diff --git a/pygobject3.spec b/pygobject3.spec index 8d60c9a..6a8ed67 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -1,6 +1,6 @@ -# Last updated for version 2.21.0 -%define glib2_version 2.22.4 -%define gobject_introspection_version 1.33.9 +# Last updated for version 3.4.1.1 +%define glib2_version 2.31.0 +%define gobject_introspection_version 1.34.1.1 %define python2_version 2.3.5 %if 0%{?fedora} > 12 @@ -21,14 +21,14 @@ ### Abstract ### Name: pygobject3 -Version: 3.3.91 +Version: 3.4.1.1 Release: 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.3/pygobject-%{version}.tar.xz +Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.4/pygobject-%{version}.tar.xz # Add these additional exclusions to the pep8 rules in "make check": # E127 continuation line over-indented for visual indent @@ -216,6 +216,7 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %{_libdir}/libpyglib-gi-2.0-python.so* %dir %{python_sitearch}/gi %{python_sitearch}/gi/* +%{python_sitearch}/pygobject-*.egg-info %files devel %defattr(644, root, root, 755) @@ -231,12 +232,15 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %{_libdir}/libpyglib-gi-2.0-python3.so* %dir %{python3_sitearch}/gi - %{python3_sitearch}/gi/* +%{python3_sitearch}/pygobject-*.egg-info %endif # with_python3 %changelog +* 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 diff --git a/sources b/sources index 1c7774f..6e125f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30967ad59df8fc604e92acc0f5254d90 pygobject-3.3.91.tar.xz +949cffe0ae8e13ac84794b04e2b58aeb pygobject-3.4.1.1.tar.xz