[pygobject3] 3.3.4-9: avoid dragging pyflakes and python-pep8 into RHEL (patch 7)
dmalcolm
dmalcolm at fedoraproject.org
Wed Aug 15 18:06:29 UTC 2012
commit 223e379afe8f514fddb0c768131a5ea712f12db4
Author: David Malcolm <dmalcolm at redhat.com>
Date: Wed Aug 15 14:05:30 2012 -0400
3.3.4-9: avoid dragging pyflakes and python-pep8 into RHEL (patch 7)
disable-pyflakes-and-pep8-in-check.patch | 28 ++++++++++++++++++++++++++++
pygobject3.spec | 13 ++++++++++++-
2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/disable-pyflakes-and-pep8-in-check.patch b/disable-pyflakes-and-pep8-in-check.patch
new file mode 100644
index 0000000..3770f97
--- /dev/null
+++ b/disable-pyflakes-and-pep8-in-check.patch
@@ -0,0 +1,28 @@
+diff -up pygobject-3.3.4/tests/Makefile.am.disable-pyflakes-and-pep8-in-check pygobject-3.3.4/tests/Makefile.am
+--- pygobject-3.3.4/tests/Makefile.am.disable-pyflakes-and-pep8-in-check 2012-08-15 14:00:25.650233579 -0400
++++ pygobject-3.3.4/tests/Makefile.am 2012-08-15 14:01:01.924780085 -0400
+@@ -106,10 +106,6 @@ RUN_TESTS_ENV_VARS= \
+ TESTS_BUILDDIR=$(builddir)
+
+ check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
+- @echo " CHECK Pyflakes"
+- pyflakes $(top_srcdir)
+- @echo " CHECK PEP8"
+- pep8 --ignore=E501,E123,E124,E127 --repeat --show-source $(top_srcdir)
+ $(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py
+
+ check.gdb:
+diff -up pygobject-3.3.4/tests/Makefile.in.disable-pyflakes-and-pep8-in-check pygobject-3.3.4/tests/Makefile.in
+--- pygobject-3.3.4/tests/Makefile.in.disable-pyflakes-and-pep8-in-check 2012-08-15 14:00:35.550109812 -0400
++++ pygobject-3.3.4/tests/Makefile.in 2012-08-15 14:01:09.717682658 -0400
+@@ -724,10 +724,6 @@ clean-local:
+ rm -f $(LTLIBRARIES:.la=.so) file.txt~
+
+ check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
+- @echo " CHECK Pyflakes"
+- pyflakes $(top_srcdir)
+- @echo " CHECK PEP8"
+- pep8 --ignore=E501,E123,E124,E127 --repeat --show-source $(top_srcdir)
+ $(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning $(srcdir)/runtests.py
+
+ check.gdb:
diff --git a/pygobject3.spec b/pygobject3.spec
index 2cfb664..08ebd69 100644
--- a/pygobject3.spec
+++ b/pygobject3.spec
@@ -22,7 +22,7 @@
Name: pygobject3
Version: 3.3.4
-Release: 8%{?dist}
+Release: 9%{?dist}
License: LGPLv2+ and MIT
Group: Development/Languages
Summary: Python 2 bindings for GObject Introspection
@@ -81,6 +81,8 @@ Patch5: test-list-marshalling.patch
# attachment 603634):
Patch6: fix-argument-to-array.patch
+# Avoid dragging pyflakes and python-pep8 into RHEL:
+Patch7: disable-pyflakes-and-pep8-in-check.patch
### Build Dependencies ###
@@ -97,8 +99,10 @@ BuildRequires: pycairo-devel
# Required by the upstream selftest suite:
%if %{with_check}
+%if 0%{?fedora}
BuildRequires: pyflakes
BuildRequires: python-pep8
+%endif
## for the Gdk and Gtk typelibs, used during the test suite:
BuildRequires: gtk3
## for xvfb-run:
@@ -158,6 +162,10 @@ for use in Python 3 programs.
%patch5 -p1 -b .test-list-marshalling
%patch6 -p1 -b .fix-argument-to-array
+%if !0%{?fedora}
+%patch7 -p1 -b .disable-pyflakes-and-pep8-in-check
+%endif
+
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
@@ -254,6 +262,9 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity}
%endif # with_python3
%changelog
+* Wed Aug 15 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.4-9
+- avoid dragging pyflakes and python-pep8 into RHEL (patch 7)
+
* Fri Aug 10 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.4-8
- add endianness patch (rhbz#841596; attachment 603634)
More information about the scm-commits
mailing list