Hello community, here is the log from the commit of package bzr for openSUSE:Factory checked in at 2018-05-15 10:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bzr (Old) and /work/SRC/openSUSE:Factory/.bzr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bzr" Tue May 15 10:15:56 2018 rev:42 rq:607052 version:2.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bzr/bzr.changes 2017-08-16 16:14:21.531949790 +0200 +++ /work/SRC/openSUSE:Factory/.bzr.new/bzr.changes 2018-05-15 10:34:27.453862045 +0200 @@ -1,0 +2,5 @@ +Sat May 12 13:34:22 UTC 2018 - [email protected] + +- Add python-2_7_13.patch to fix boo#1020047 (lp#1644003) + +------------------------------------------------------------------- New: ---- python-2_7_13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bzr.spec ++++++ --- /var/tmp/diff_new_pack.pXomzT/_old 2018-05-15 10:34:28.145836631 +0200 +++ /var/tmp/diff_new_pack.pXomzT/_new 2018-05-15 10:34:28.145836631 +0200 @@ -1,7 +1,7 @@ # # spec file for package bzr # -# 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 @@ -20,13 +20,15 @@ Version: 2.7.0 Release: 0 Summary: Friendly distributed version control system -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Tools/Version Control Url: http://bazaar.canonical.com/ Source0: https://launchpad.net/bzr/2.7/%{version}/+download/%{name}-%{version}.tar.gz Source1: https://launchpad.net/bzr/2.7/%{version}/+download/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring Patch0: bzr-doc-timestamp.patch +# FIX-UPSTREAM-PATCH: fix for python 2.7.13 and later (boo#1020047) +Patch1: python-2_7_13.patch BuildRequires: fdupes BuildRequires: python-Cython BuildRequires: python-devel @@ -56,6 +58,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p0 sed -i "s|\"share/locale\"|\"locale\"|" setup.py # Fix the locale installation path %build ++++++ python-2_7_13.patch ++++++ === modified file 'bzrlib/lazy_regex.py' --- bzrlib/lazy_regex.py 2011-12-19 13:23:58 +0000 +++ bzrlib/lazy_regex.py 2017-01-15 20:36:48 +0000 @@ -131,3 +131,13 @@ raise AssertionError( "re.compile has already been overridden as lazy_compile, but this would" \ " cause infinite recursion") + + +# re.finditer get confused if it receives a LazyRegex +if getattr(re, 'finditer', None is not None): + def finditer_public(pattern, string, flags=0): + if isinstance(pattern, LazyRegex): + return pattern.finditer(string) + else: + return _real_re_compile(pattern, flags).finditer(string) +re.finditer = finditer_public
