!6 Fix build failure caused by guava upgrade

From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-11-14 02:08:53 +00:00 committed by Gitee
commit fcb434f71d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -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