Attachment 840029 Details for Bug 1045724 – Run test suite during build, drop INSTALL from docs.

[patch] Run test suite during build, drop INSTALL from docs.

Run-test-suite-during-build-drop-INSTALL-from-docs.patch (text/plain), 3.05 KB, created by Ville Skyttä on 2013-12-21 14:14:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2013-12-21 14:14:43 UTC

Size: 3.05 KB

patch

obsolete

>From 619163b344f5a651bcb88649f74d8dcf8ce54c94 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 21 Dec 2013 16:11:43 +0200
>Subject: [PATCH] Run test suite during build, drop INSTALL from docs.
>
>---
> pycairo-1.10.0-test-python3.patch | 12 ++++++++++++
> python3-cairo.spec                | 15 +++++++++++++--
> 2 files changed, 25 insertions(+), 2 deletions(-)
> create mode 100644 pycairo-1.10.0-test-python3.patch
>
>diff --git a/pycairo-1.10.0-test-python3.patch b/pycairo-1.10.0-test-python3.patch
>new file mode 100644
>index 0000000..32e398f
>--- /dev/null
>+++ b/pycairo-1.10.0-test-python3.patch
>@@ -0,0 +1,12 @@
>+diff -up pycairo-1.10.0/test/examples_test.py~ pycairo-1.10.0/test/examples_test.py
>+--- pycairo-1.10.0/test/examples_test.py~	2010-05-29 08:28:35.000000000 +0300
>++++ pycairo-1.10.0/test/examples_test.py	2013-12-20 22:53:07.806217741 +0200
>+@@ -14,7 +14,7 @@ def test_snippets():
>+   examples/cairo_snippets/snippets/
>+   '''
>+   def doSnippets(name):
>+-    retcode = subprocess.call('python %s -s' % name, shell=True)
>++    retcode = subprocess.call('python3 %s -s' % name, shell=True)
>+     assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
>+ 
>+   os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',
>diff --git a/python3-cairo.spec b/python3-cairo.spec
>index 644be1b..8a114fb 100644
>--- a/python3-cairo.spec
>+++ b/python3-cairo.spec
>@@ -4,19 +4,21 @@
> 
> Name: python3-cairo
> Version: 1.10.0
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> License: MPLv1.1 or LGPLv2
> Group: Development/Languages
> Summary: Python 3 bindings for the cairo library
> URL: http://cairographics.org/pycairo
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> Source: http://cairographics.org/releases/pycairo-%{version}.tar.bz2
>+Patch0: pycairo-1.10.0-test-python3.patch
> 
> ### Build Dependencies ###
> 
> BuildRequires: cairo-devel >= %{cairo_version}
> BuildRequires: pkgconfig
> BuildRequires: python3-devel
>+BuildRequires: python3-pytest
> 
> %description
> Python 3 bindings for the cairo library.
>@@ -35,6 +37,7 @@ libraries so that they interoperate with python3-cairo.
> 
> %prep
> %setup -q -n pycairo-%{version}
>+%patch0 -p1
> 
> # Ensure that ./waf has created the cached unpacked version
> # of the wafadmin source tree.
>@@ -67,12 +70,16 @@ find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
> 
> find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
> 
>+%check
>+cd test
>+PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitearch} %{_bindir}/py.test-3*
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %files
> %defattr(-,root,root,-)
>-%doc AUTHORS COPYING* INSTALL NEWS README
>+%doc AUTHORS COPYING* NEWS README
> %doc examples doc/faq.rst doc/overview.rst doc/README 
> %{python3_sitearch}/cairo/
> 
>@@ -83,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
> %{_libdir}/pkgconfig/py3cairo.pc
> 
> %changelog
>+* Fri Dec 20 2013 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.10.0-7
>+- Run test suite during build.
>+- Drop INSTALL from docs.
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1045724: 840029