From ee26b351bf943d7d25afa78aa2feb035ddd17162352b680aa9718f5e5d41c2cf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 13:16:29 +0000 Subject: [PATCH 1/2] Remove superfluous devel dependency for noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-billiard?expand=0&rev=30 --- python-billiard.changes | 5 +++++ python-billiard.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python-billiard.changes b/python-billiard.changes index dd1170e..80fe183 100644 --- a/python-billiard.changes +++ b/python-billiard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 12:46:06 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Mon Jun 26 20:20:22 UTC 2017 - benoit.monin@gmx.fr diff --git a/python-billiard.spec b/python-billiard.spec index 4b14923..4d08ddb 100644 --- a/python-billiard.spec +++ b/python-billiard.spec @@ -1,7 +1,7 @@ # # spec file for package python-billiard # -# Copyright (c) 2017 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,7 +26,6 @@ License: BSD-3-Clause Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/b/billiard/billiard-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros From a6b918c0decfff932defa4afe0f2cbc243d782244c7aafa9757869fbc8c8c579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 6 Dec 2018 11:17:36 +0000 Subject: [PATCH 2/2] - Fix the build again - Fix the fdupes call - Update version to 3.5.0.5: * Various small bugfixes all around OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-billiard?expand=0&rev=31 --- billiard-3.5.0.2.tar.gz | 3 --- billiard-3.5.0.5.tar.gz | 3 +++ python-billiard.changes | 8 ++++++++ python-billiard.spec | 37 ++++++++++++++----------------------- 4 files changed, 25 insertions(+), 26 deletions(-) delete mode 100644 billiard-3.5.0.2.tar.gz create mode 100644 billiard-3.5.0.5.tar.gz diff --git a/billiard-3.5.0.2.tar.gz b/billiard-3.5.0.2.tar.gz deleted file mode 100644 index e2b1c7b..0000000 --- a/billiard-3.5.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3eb01a8fe44116aa6d63d2010515ef1526e40caee5f766f75b2d28393332dcaa -size 157299 diff --git a/billiard-3.5.0.5.tar.gz b/billiard-3.5.0.5.tar.gz new file mode 100644 index 0000000..90a0e83 --- /dev/null +++ b/billiard-3.5.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42d9a227401ac4fba892918bba0a0c409def5435c4b483267ebfe821afaaba0e +size 150031 diff --git a/python-billiard.changes b/python-billiard.changes index 80fe183..2e95ad4 100644 --- a/python-billiard.changes +++ b/python-billiard.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 6 11:17:08 UTC 2018 - Tomáš Chvátal + +- Fix the build again +- Fix the fdupes call +- Update version to 3.5.0.5: + * Various small bugfixes all around + ------------------------------------------------------------------- Tue Dec 4 12:46:06 UTC 2018 - Matej Cepl diff --git a/python-billiard.spec b/python-billiard.spec index 4d08ddb..42282fa 100644 --- a/python-billiard.spec +++ b/python-billiard.spec @@ -18,33 +18,31 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-billiard -Version: 3.5.0.2 +Version: 3.5.0.5 Release: 0 -Url: https://github.com/celery/billiard Summary: Python multiprocessing fork License: BSD-3-Clause Group: Development/Languages/Python +URL: https://github.com/celery/billiard Source: https://files.pythonhosted.org/packages/source/b/billiard/billiard-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: %{python_module case >= 1.3.1} +BuildRequires: %{python_module pytest >= 3.0} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -# Documentation requirements (only python3 needed): +BuildRequires: python2-devel +# Documentation requirements BuildRequires: python3-Sphinx >= 0.5 -# Test requirements: -BuildRequires: %{python_module case >= 1.3.1} -BuildRequires: %{python_module pytest >= 3.0} -Suggests: %name-doc = %version +Suggests: %{name}-doc = %{version} %ifpython3 BuildArch: noarch %endif %package -n %{name}-doc -Summary: Documentation for %name +Summary: Documentation for %{name} Group: Development/Languages/Python Provides: %{python_module billiard-doc = %{version}} BuildArch: noarch - %python_subpackages %description @@ -54,7 +52,7 @@ pyprocessing package. This standalone variant is intended to be compatible with Python 2.4 and 2.5, and will draw it's fixes/improvements from python-trunk. %description -n %{name}-doc -Documentation and help files for %name. +Documentation and help files for %{name}. %prep %setup -q -n billiard-%{version} @@ -68,24 +66,17 @@ popd %install %python_install -%fdupes %buildroot/%_prefix +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitearch} %check %python_exec setup.py test -%files %{python_files} -%defattr(-,root,root,-) +%files %{python_files} %doc CHANGES.txt README.rst -%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320 %license LICENSE.txt -%else -%doc LICENSE.txt -%endif -%ifpython2 -%{python_sitearch}/* -%else -%{python_sitelib}/* -%endif +%python3_only %{python_sitelib}/* +%python2_only %{python_sitearch}/* %files -n %{name}-doc %doc Doc/html