From 5629639d0e904ab43aac901cb03c98110ee47e5f Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Apr 06 2018 11:53:14 +0000
Subject: Merge branch 'f27' into f28


---

diff --git a/.gitignore b/.gitignore
index 34be167..60476a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /colorspacious-1.0.0.zip
+/colorspacious-1.1.1.tar.gz
diff --git a/python-colorspacious-utf8.patch b/python-colorspacious-utf8.patch
deleted file mode 100644
index dad3969..0000000
--- a/python-colorspacious-utf8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up colorspacious-1.0.0/setup.py.utf8 colorspacious-1.0.0/setup.py
---- colorspacious-1.0.0/setup.py.utf8	2015-07-03 23:59:18.000000000 +0200
-+++ colorspacious-1.0.0/setup.py	2016-09-22 13:07:23.566264573 +0200
-@@ -8,7 +8,8 @@ import numpy as np
- DESC = ("A powerful, accurate, and easy-to-use Python library for "
-         "doing colorspace conversions")
- 
--LONG_DESC = open("README.rst").read()
-+with open('README.rst', 'rb') as f:
-+    LONG_DESC = f.read().decode('utf-8')
- 
- # defines __version__
- exec(open("colorspacious/version.py").read())
diff --git a/python-colorspacious.spec b/python-colorspacious.spec
index 2b4abf6..109acff 100644
--- a/python-colorspacious.spec
+++ b/python-colorspacious.spec
@@ -1,22 +1,25 @@
+%bcond_without check
+%bcond_without html
 %global pname colorspacious
-%global with_html 1
 
 Name: python-%{pname}
-Version: 1.0.0
-Release: 8%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Summary: Perform colorspace conversions accurately and easily
 License: MIT
 URL: https://github.com/njsmith/colorspacious
-Source0: https://files.pythonhosted.org/packages/source/c/%{pname}/%{pname}-%{version}.zip
-# https://github.com/njsmith/colorspacious/issues/6
-Patch0: %{name}-utf8.patch
-%if %{with_html}
+Source0: https://files.pythonhosted.org/packages/source/c/%{pname}/%{pname}-%{version}.tar.gz
+%if %{with html}
 BuildRequires: graphviz
 BuildRequires: python2-ipython-sphinx
 BuildRequires: python2-sphinxcontrib-bibtex
 BuildRequires: python2-functools32
 BuildRequires: python2-matplotlib
 %endif
+%if %{with check}
+BuildRequires: python2-nose
+BuildRequires: python3-nose
+%endif
 BuildArch: noarch
 
 %global desc \
@@ -66,12 +69,11 @@ This package contains the python3 module.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 rm -r *.egg-info
 
 %build
 %py2_build
-%if %{with_html}
+%if %{with html}
 pushd doc
 PYTHONPATH=`realpath ../build/lib.linux*` make html
 popd
@@ -82,22 +84,34 @@ popd
 %py2_install
 %py3_install
 
-%if %{with_html}
+%if %{with check}
+%check
+nosetests-2 --all-modules colorspacious
+nosetests-3 --all-modules colorspacious
+%endif
+
+%if %{with html}
 %files doc
 %doc doc/_build/html/*
 %endif
 
 %files -n python2-%{pname}
 %doc README.rst
-%{python2_sitelib}/%{pname}-%{version}-py2.?.egg-info
+%{python2_sitelib}/%{pname}-%{version}-py%{python2_version}.egg-info
 %{python2_sitelib}/%{pname}
 
 %files -n python3-%{pname}
 %doc README.rst
-%{python3_sitelib}/%{pname}-%{version}-py3.?.egg-info
+%{python3_sitelib}/%{pname}-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/%{pname}
 
 %changelog
+* Fri Apr 06 2018 Dominik Mierzejewski <dominik@greysector.net> 1.1.1-1
+- update to 1.1.1 (#1562763)
+- upstream switched to tar.gz for source
+- drop obsolete patch
+- enable testsuite
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 72aeb4f..b5f275a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-437218f372a0a832a70299cc6397feb1  colorspacious-1.0.0.zip
+SHA512 (colorspacious-1.1.1.tar.gz) = 910dc6d508f0522de9768e0698b2a274e90b49c15750aeac2c9c918c9c31197433931600a417d68b7871327d72f7057f2c39d8e8e45529a1ed633e29410ef299