From 64713fa3c3599cab4f8325a62aec1f1237c980777d3f8a0fa692789b04becda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 20 Dec 2017 15:25:13 +0000 Subject: [PATCH] Accepting request 558560 from home:badshah400:branches:science Minor fixes OBS-URL: https://build.opensuse.org/request/show/558560 OBS-URL: https://build.opensuse.org/package/show/science/python-Mathics?expand=0&rev=2 --- python-Mathics.changes | 8 ++++++++ python-Mathics.spec | 8 +++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/python-Mathics.changes b/python-Mathics.changes index 3440c27..e9553b5 100644 --- a/python-Mathics.changes +++ b/python-Mathics.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 19 10:56:27 UTC 2017 - badshah400@gmail.com + +- Correct License: Includes software licensed as BSD-3-Clause, + MIT, and Apache-2.0, and data licensed under CC-by-SA-3.0 and/or + GFDL. +- Use python_expand to run fdupes for both python 2 and 3. + ------------------------------------------------------------------- Mon Dec 18 07:34:29 UTC 2017 - badshah400@gmail.com diff --git a/python-Mathics.spec b/python-Mathics.spec index 7c5a7f6..3a0cd0a 100644 --- a/python-Mathics.spec +++ b/python-Mathics.spec @@ -21,8 +21,8 @@ Name: python-Mathics Version: 1.0 Release: 0 Summary: A general-purpose computer algebra system -# FIXME: Contains other OS Licensed components -License: GPL-3.0 +# Mathics itself is licensed as GPL-3.0 but it includes third-party software with MIT, BSD-3-Clause, and Apache-2.0 Licensing; also includes data from wikipedia licensed under CC-BY-SA-3.0 and GFDL-1.3 +License: GPL-3.0 and BSD-3-Clause and MIT and Apache-2.0 Group: Development/Languages/Python Url: https://mathics.github.io/ Source: https://github.com/mathics/Mathics/archive/v%{version}.tar.gz @@ -37,7 +37,6 @@ BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.10} BuildRequires: %{python_module sympy} -Requires: python-colorama Requires: python-Django >= 1.8 Requires: python-mpmath >= 0.19 Requires: python-python-dateutil @@ -79,8 +78,7 @@ popd #%%check #%%python_exec setup.py test -%fdupes %{buildroot}%{python2_sitelib}/ -%fdupes %{buildroot}%{python3_sitelib}/ +%python_expand %fdupes %{buildroot}%{$python_sitelib}/ %files %python_files %defattr(-,root,root)