diff --git a/kiwisolver-0.1.3.zip b/kiwisolver-0.1.3.zip deleted file mode 100644 index a7a5ea1..0000000 --- a/kiwisolver-0.1.3.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbcd6470dd8518ec8d2d0daec96551291e2e17f0e910ec2502a2ecc1c7c98b44 -size 48696 diff --git a/kiwisolver-1.0.1.tar.gz b/kiwisolver-1.0.1.tar.gz new file mode 100644 index 0000000..0e5ce4a --- /dev/null +++ b/kiwisolver-1.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278 +size 31618 diff --git a/python-kiwisolver.changes b/python-kiwisolver.changes index 9507128..9c5c46e 100644 --- a/python-kiwisolver.changes +++ b/python-kiwisolver.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 13 19:23:10 UTC 2018 - toddrme2178@gmail.com + +- Update to 1.0.1 + * allow unicode strings for variable name in Python 2 + * allow unicode strings as strength specifiers in Python 2 +- Update to 1.0.0 + * Allow anonymous variables (solver PR #32, wrappers PR #22) + * Solver: Define binary operators as free functions (PR #23) + * Wrappers: support for Python 3 (PR #13) + * Wrappers: drop distribute dependency in favor of setuptools (PR #22) + * Wrappers: add a comprehensive test suite +- Implement single-spec version +- Complete spec file rewrite. + ------------------------------------------------------------------- Fri Sep 4 10:51:30 UTC 2015 - toddrme2178@gmail.com diff --git a/python-kiwisolver.spec b/python-kiwisolver.spec index c32d180..d585fc8 100644 --- a/python-kiwisolver.spec +++ b/python-kiwisolver.spec @@ -1,7 +1,7 @@ # # spec file for package python-kiwisolver # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,28 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +# Test files not in source archive +%bcond_with test Name: python-kiwisolver -Version: 0.1.3 +Version: 1.0.1 Release: 0 Summary: A fast implementation of the Cassowary constraint solver License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/nucleic/kiwi -Source: https://pypi.python.org/packages/source/k/kiwisolver/kiwisolver-%{version}.zip -BuildRequires: gcc-c++ -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: unzip -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +Source: https://files.pythonhosted.org/packages/source/k/kiwisolver/kiwisolver-%{version}.tar.gz +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: c++_compiler +BuildRequires: fdupes +BuildRequires: python-rpm-macros +%if %{with test} +BuildRequires: %{python_module pytest} %endif +%python_subpackages + %description Kiwi is an efficient C++ implementation of the Cassowary constraint solving algorithm. Kiwi is an implementation of the algorithm based on the seminal @@ -46,17 +51,26 @@ In addition to the C++ solver, Kiwi ships with hand-rolled Python bindings. %prep %setup -q -n kiwisolver-%{version} # Fix wrong-file-end-of-line-encoding -sed -i 's/\r$//' COPYING.txt -sed -i 's/\r$//' README.rst -sed -i 's/\r$//' releasenotes.rst +sed -i 's/\r$//' COPYING.txt README.rst releasenotes.rst %build -CFLAGS="%{optflags}" python setup.py build +export CFLAGS="%{optflags}" +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} -%files +%if %{with test} +%check +pushd py +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} +py.test-%{$python_bin_suffix} tests/ +} +popd +%endif + +%files %{python_files} %defattr(-,root,root,-) %doc COPYING.txt README.rst releasenotes.rst %{python_sitearch}/*