diff --git a/python-pybtex-elementtree.patch b/python-pybtex-elementtree.patch new file mode 100644 index 0000000..c0b01b2 --- /dev/null +++ b/python-pybtex-elementtree.patch @@ -0,0 +1,11 @@ +--- pybtex/database/input/bibtexml.py.orig 2020-01-26 04:42:39.000000000 -0700 ++++ pybtex/database/input/bibtexml.py 2020-03-27 10:38:52.697396281 -0600 +@@ -21,7 +21,7 @@ + + from __future__ import unicode_literals + +-from xml.etree import cElementTree as ET ++from xml.etree import ElementTree as ET + + from pybtex.database import Entry, Person + from pybtex.database.input import BaseParser diff --git a/python-pybtex-escape.patch b/python-pybtex-escape.patch deleted file mode 100644 index 42a8a87..0000000 --- a/python-pybtex-escape.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pybtex/bibtex/runner.py.orig 2019-10-15 13:10:50.000000000 -0600 -+++ pybtex/bibtex/runner.py 2020-01-24 13:16:30.237029957 -0700 -@@ -97,7 +97,7 @@ def format_name(name, format): - - - def parse_name(name): -- space = re.compile('[\s~]+') -+ space = re.compile(r'[\s~]+') - formatted_name = format_name(name, '{ff}|{vv}|{ll}|{jj}') - parts = [space.sub(' ', part.strip()) for part in formatted_name.split('|')] - first, von, last, junior = parts ---- pybtex/database/output/bibtex.py.orig 2019-10-15 13:10:50.000000000 -0600 -+++ pybtex/database/output/bibtex.py 2020-01-24 13:17:16.724479531 -0700 -@@ -36,7 +36,7 @@ class Writer(BaseWriter): - unicode_io = True - - def quote(self, s): -- """ -+ r""" - >>> w = Writer() - >>> print(w.quote('The World')) - "The World" diff --git a/python-pybtex.spec b/python-pybtex.spec index 6811b9c..62c105e 100644 --- a/python-pybtex.spec +++ b/python-pybtex.spec @@ -2,13 +2,13 @@ # The python-sphinxcontrib-bibtex package needs fixes to the sorting code that # have not yet been released, so we check out from git until the next release. -%global commit 6d9d812c82ce1056460c96527b2c6b32fd98c435 +%global commit e1336fb33c92a878465f664d57179bc8d1c21b78 %global shortcommit %(c=%{commit}; echo ${c:0:12}) -%global gitdate 20191015 +%global gitdate 20200126 Name: python-%{srcname} Version: 0.22.2 -Release: 8.%{gitdate}.%{shortcommit}%{?dist} +Release: 9.%{gitdate}.%{shortcommit}%{?dist} Summary: BibTeX-compatible bibliography processor written in Python License: MIT @@ -17,9 +17,9 @@ URL: http://pybtex.org/ Source0: https://bitbucket.org/pybtex-devs/pybtex/get/%{commit}.tar.gz#/%{srcname}-%{shortcommit}.tar.gz # Fix a minor sphinx problem, leads to bad man page output Patch0: %{name}-parsing.patch -# Fix insufficently escaped strings -# https://bitbucket.org/pybtex-devs/pybtex/pull-requests/18/ -Patch1: %{name}-escape.patch +# Do not use cElementTree. It was deprecated in python 3.3 and removed in 3.9. +# https://bitbucket.org/pybtex-devs/pybtex/pull-requests/19/ +Patch1: %{name}-elementtree.patch BuildArch: noarch @@ -117,6 +117,11 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest %doc CHANGES docs/build/html %changelog +* Fri Mar 27 2020 Jerry James - 0.22.2-9.20200126.e1336fb33c92 +- Update to git head to fix duplicate person issue +- Drop upstreamed -escape patch +- Add -elementtree patch to fix python 3.9 build (bz 1817962) + * Thu Jan 30 2020 Fedora Release Engineering - 0.22.2-8.20191015.6d9d812c82ce - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 14d6c1e..52f7aa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pybtex-6d9d812c82ce.tar.gz) = 1fe8efc8b5fb99c543db42b8d85366bf336e315d26ca17b30f7251e56ffadb7cd31603c268872c60f463cdd9d6303b796b8b1a6cd188eaa16fcd8b6f6cd38348 +SHA512 (pybtex-e1336fb33c92.tar.gz) = c2de3c1d583e041da40f0c7a908f1acea9ef551041906af4137a98311ca8c5ab85e2b9386b6cdea17dd9bbd510f2f64d8654f7edf6f64579c90f44b6f3709a61