From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 21 Oct 2019 20:02:40 +0000 (+0200)
Subject: - new URLs, updated to 2.4.2
X-Git-Tag: auto/th/python-pyparsing-2.4.2-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-pyparsing.git;a=commitdiff_plain;h=f3ca9dc

- new URLs, updated to 2.4.2
---

diff --git a/python-pyparsing.spec b/python-pyparsing.spec
index 945a65a..8cfddd9 100644
--- a/python-pyparsing.spec
+++ b/python-pyparsing.spec
@@ -1,33 +1,35 @@
 #
 # Conditional build:
+%bcond_without	doc	# Sphinx documentation
 %bcond_without	python2 # CPython 2.x module
 %bcond_without	python3 # CPython 3.x module
-%bcond_without  setuptools # build without setuptools (for bootstraping)
 
 %define 	module	pyparsing
-Summary:	pyparsing - a Python module for creating executing simple grammars
-Summary(pl.UTF-8):	pyparsing - moduł Pythona umożliwiający tworzenie i parsowanie prostych gramatyk
+Summary:	pyparsing - Python 2 module for creating executing simple grammars
+Summary(pl.UTF-8):	pyparsing - moduł Pythona 2 umożliwiający tworzenie i parsowanie prostych gramatyk
 Name:		python-%{module}
-Version:	2.2.0
-Release:	2
+Version:	2.4.2
+Release:	1
 License:	MIT
 Group:		Libraries/Python
-Source0:	http://downloads.sourceforge.net/pyparsing/%{module}-%{version}.tar.gz
-# Source0-md5:	0214e42d63af850256962b6744c948d9
-URL:		http://pyparsing.sourceforge.net/
+#Source0Download: https://pypi.org/simple/pyparsing/
+Source0:	https://files.pythonhosted.org/packages/source/p/pyparsing/%{module}-%{version}.tar.gz
+# Source0-md5:	46d02cbe0461fe0571d51649e6006ef5
+URL:		https://github.com/pyparsing/pyparsing/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with python2}
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	python-modules >= 1:2.6
-%{?with_setuptools:BuildRequires:	python-setuptools}
+BuildRequires:	python-setuptools
 %endif
 %if %{with python3}
 BuildRequires:	python3-devel >= 1:3.3
 BuildRequires:	python3-modules >= 1:3.3
-%{?with_setuptools:BuildRequires:	python3-setuptools}
+BuildRequires:	python3-setuptools
 %endif
-Requires:	python-libs
+%{?with_doc:BuildRequires:	sphinx-pdg}
+Requires:	python-modules >= 1:2.6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,9 +48,10 @@ klas, przy pomocy których gramatyka tworzona jest wprost w kodzie
 Pythona.
 
 %package -n python3-%{module}
-Summary:	pyparsing - a Python3 module for creating executing simple grammars
-Summary(pl.UTF-8):	pyparsing - moduł Pythona3 umożliwiający tworzenie i parsowanie prostych gramatyk
+Summary:	pyparsing - Python 3 module for creating executing simple grammars
+Summary(pl.UTF-8):	pyparsing - moduł Pythona 3 umożliwiający tworzenie i parsowanie prostych gramatyk
 Group:		Libraries/Python
+Requires:	python-modules >= 1:3.3
 
 %description -n python3-%{module}
 The parsing module is an alternative approach to creating and
@@ -100,6 +103,10 @@ Pakiet zawierający przykładowe skrypty dla modułu Pythona pyparsing.
 %py3_build
 %endif
 
+%if %{with doc}
+%{__make} -C docs html
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{py_sitescriptdir},%{_examplesdir}/%{name}-%{version}}
@@ -122,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES LICENSE README
+%doc CHANGES LICENSE README.rst
 %{py_sitescriptdir}/pyparsing.py[co]
 %{py_sitescriptdir}/pyparsing-*.egg-info
 %endif
@@ -130,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc CHANGES LICENSE README
+%doc CHANGES LICENSE README.rst
 %{py3_sitescriptdir}/pyparsing.py
 %{py3_sitescriptdir}/__pycache__/pyparsing*.py[co]
 %{py3_sitescriptdir}/pyparsing-*.egg-info
@@ -138,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(644,root,root,755)
-%doc HowToUsePyparsing.html htmldoc pyparsingClassDiagram.{JPG,PNG}
+%doc docs/_build/html/{_static,*.html,*.js}
 
 %files examples
 %defattr(644,root,root,755)