From 7f46bb8ff8c1a50fe3649174307d7d5af163bd18 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Mon, 13 Nov 2023 09:50:15 +0800
Subject: [PATCH] Fix build failure caused by guava upgrade

---
 jython.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/jython.spec b/jython.spec
index f138473..5dde271 100644
--- a/jython.spec
+++ b/jython.spec
@@ -2,7 +2,7 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 Name:                jython
 Version:             2.7.1
-Release:             1
+Release:             2
 Summary:             A Java implementation of the Python language
 License:             ASL 1.1 and BSD 
 URL:                 http://www.jython.org/
@@ -66,7 +66,7 @@ Demonstrations and samples for %{name}.
 %patch2 -R -p1
 %patch0
 %patch1
-#%patch3
+%patch3
 %patch4 -p1
 %patch5
 
@@ -80,10 +80,6 @@ rmdir Lib/ensurepip/_bundled
 %endif
 rm -rf extlibs/*
 sed -i -e '/<javadoc/a additionalparam="-Xdoclint:none"' build.xml
-sed -i -e 's/CharMatcher\.ascii()/CharMatcher.ASCII/' \
-  src/org/python/core/PyUnicode.java \
-  src/org/python/core/PyBaseCode.java \
-  src/org/python/core/Py.java
 
 %build
 build-jar-repository -p -s extlibs \
@@ -144,5 +140,8 @@ ln -s %{_datadir}/%{name}/bin/jython $RPM_BUILD_ROOT%{_bindir}
 %{_datadir}/%{name}/Demo
 
 %changelog
+* Mon Nov 13 2023 wangkai <13474090681@163.com> - 2.7.1-2
+- Fix build failure caused by guava upgrade
+
 * Mon Aug 3 2020 yanan li <liyanan032@huawei.com> - 2.7.1-1
 - Package init