From 989672fcf6f108a054ee79ab9dce2b09293a4902edd4ddfead234c500c5c03fa Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Sep 2018 17:39:25 +0000 Subject: [PATCH] Accepting request 633190 from home:mcepl:work - Separate python-pyparsing-doc package so that tests can be run without introducing circular dependency. - Clean up SPEC file. OBS-URL: https://build.opensuse.org/request/show/633190 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=41 --- python-pyparsing-doc.changes | 5 +++ python-pyparsing-doc.spec | 60 ++++++++++++++++++++++++++++++++++++ python-pyparsing.changes | 5 +++ python-pyparsing.spec | 30 +++++------------- 4 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 python-pyparsing-doc.changes create mode 100644 python-pyparsing-doc.spec diff --git a/python-pyparsing-doc.changes b/python-pyparsing-doc.changes new file mode 100644 index 0000000..70e8bd6 --- /dev/null +++ b/python-pyparsing-doc.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sat Aug 18 09:41:30 UTC 2018 - Matěj Cepl + +- Separate python-pyparsing-doc package so that tests can be run + without introducing circular dependency. diff --git a/python-pyparsing-doc.spec b/python-pyparsing-doc.spec new file mode 100644 index 0000000..24b6b63 --- /dev/null +++ b/python-pyparsing-doc.spec @@ -0,0 +1,60 @@ +# +# spec file for package python-pyparsing-doc +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +%define basename python-parsing +%define oldpython python +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +Name: python-pyparsing-doc +Version: 2.2.0 +Release: 0 +Summary: Grammar Parser Library for Python - Documentation +License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later +Group: Development/Libraries/Python +URL: http://pyparsing.wikispaces.com/ +Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz +BuildRequires: %{python_module base} +BuildRequires: %{python_module nose} +Requires: %{basename} = %{version} +BuildArch: noarch +%python_subpackages + +%description +The pyparsing module is an alternative approach to creating and executing +simple grammars, vs. the traditional lex/yacc approach, or the use of regular +expressions. The pyparsing module provides a library of classes that client +code uses to construct the grammar directly in Python code. + +This package contains the documentation of %{basename} + +%prep +%setup -q -n pyparsing-%{version} + +%build +sed -i 's/\r$//' LICENSE examples/* + +%install +: + +%check +%python_expand nosetests-%{$python_bin_suffix} -v + +%files %{python_files} +%license LICENSE +%doc docs/* examples + +%changelog diff --git a/python-pyparsing.changes b/python-pyparsing.changes index 2082c44..b6cd5df 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 18 09:41:30 UTC 2018 - Matěj Cepl + +- Clean up SPEC file. + ------------------------------------------------------------------- Tue Mar 14 21:27:44 UTC 2017 - dmueller@suse.com diff --git a/python-pyparsing.spec b/python-pyparsing.spec index fae2257..0b47875 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyparsing # -# 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 @@ -22,16 +22,16 @@ Name: python-pyparsing Version: 2.2.0 Release: 0 Summary: Grammar Parser Library for Python -License: MIT and GPL-2.0+ and GPL-3.0+ +License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later Group: Development/Languages/Python -Url: http://pyparsing.wikispaces.com/ +URL: http://pyparsing.wikispaces.com/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRequires: %{python_module base} +BuildRequires: fdupes BuildRequires: python-rpm-macros # do not add dependencies on setuptools and ideally not even full "python"; # this is now a dependency of setuptools Requires: python-base -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %ifpython2 Provides: %{oldpython}-parsing = %{version} @@ -45,19 +45,6 @@ simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code. -%package doc -Summary: Grammar Parser Library for Python - Documentation -Group: Development/Libraries/Python -Requires: %{name} = %{version} - -%description doc -The pyparsing module is an alternative approach to creating and executing -simple grammars, vs. the traditional lex/yacc approach, or the use of regular -expressions. The pyparsing module provides a library of classes that client -code uses to construct the grammar directly in Python code. - -This package contains the documentation of %{name} - %prep %setup -q -n pyparsing-%{version} @@ -72,16 +59,13 @@ sed -i 's/\r$//' CHANGES LICENSE README examples/* %{python_expand rm %{buildroot}%{$python_sitelib}/*.egg-info cp -r pyparsing.egg-info %{buildroot}%{$python_sitelib}/pyparsing-%{version}-py%{$python_version}.egg-info } +%python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} -%defattr(-,root,root,-) -%doc CHANGES LICENSE README +%license LICENSE +%doc CHANGES README %{python_sitelib}/pyparsing.py* %pycache_only %{python_sitelib}/__pycache__/* %{python_sitelib}/pyparsing-%{version}-py*.egg-info/ -%files %{python_files doc} -%defattr(-,root,root,-) -%doc docs/* examples - %changelog