From 5cc7f7400784b65787cfaa690440a2a065e2f434 Mon Sep 17 00:00:00 2001 From: yatin Date: Feb 26 2019 13:56:36 +0000 Subject: Update to 2.3.1 Also switch to sphinx-build and adjust documentation. --- diff --git a/.gitignore b/.gitignore index ffb9bb7..55870f4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /pyparsing-2.1.10.tar.gz /pyparsing-2.2.0.tar.gz /pyparsing-2.3.0.tar.gz +/pyparsing-2.3.1.tar.gz diff --git a/pyparsing.spec b/pyparsing.spec index b9361a1..d4fd97c 100644 --- a/pyparsing.spec +++ b/pyparsing.spec @@ -8,8 +8,8 @@ Summary: %{sum} Name: pyparsing -Version: 2.3.0 -Release: 2%{?dist} +Version: 2.3.1 +Release: 1%{?dist} License: MIT URL: https://github.com/pyparsing/pyparsing @@ -17,7 +17,7 @@ Source0: https://github.com/%{name}/%{name}/archive/%{name}_%{version}/%{ BuildArch: noarch BuildRequires: dos2unix -BuildRequires: epydoc +BuildRequires: python2-sphinx BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python3-devel @@ -66,9 +66,7 @@ This is the Python 3 version. %prep %setup -q -n %{name}-%{name}_%{version} -mv pyparsingClassDiagram.PNG pyparsingClassDiagram.png -rm pyparsingClassDiagram.JPG -dos2unix -k CHANGES LICENSE README.md +dos2unix -k CHANGES LICENSE %build @@ -84,8 +82,11 @@ dos2unix -k CHANGES LICENSE README.md %endif # build docs -epydoc -v --name pyparsing -o htmldoc --inheritance listed --no-private --no-frames pyparsing.py - +pushd docs +# Theme is not available +sed -i '/alabaster/d' conf.py +sphinx-build -b html . html +popd %install %if 0%{?build_wheel} @@ -108,23 +109,26 @@ epydoc -v --name pyparsing -o htmldoc --inheritance listed --no-private --no-fra %files -n python2-pyparsing %license LICENSE -%doc CHANGES README.md +%doc CHANGES README.rst %{python2_sitelib}/pyparsing.py* %{python2_sitelib}/pyparsing-*dist-info/ %files -n python3-pyparsing %license LICENSE -%doc CHANGES README.md +%doc CHANGES README.rst %{python3_sitelib}/pyparsing.py %{python3_sitelib}/__pycache__/* %{python3_sitelib}/pyparsing-*dist-info/ %files doc %license LICENSE -%doc CHANGES README.md HowToUsePyparsing.html examples htmldoc +%doc CHANGES README.rst docs/html examples %changelog +* Tue Feb 26 2019 Yatin Karel - 2.3.1-1 +- Update to 2.3.1 + * Sat Feb 02 2019 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 3863821..4967902 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyparsing-2.3.0.tar.gz) = 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e +SHA512 (pyparsing-2.3.1.tar.gz) = 8c0e2c7a7dc7ec12f3e7c260bde25a33f325af89d9bc2329b7882ebd8a3f506fb06a36fdaba0fd8ed48040d5b7fc5288c41b01f2df84459a9980a035cb213dd0