!2 disable python2

From: @jackie_wu123
Reviewed-by: @rita_dong
Signed-off-by: @rita_dong
This commit is contained in:
openeuler-ci-bot 2020-11-11 15:21:57 +08:00 committed by Gitee
commit 41f23e04f0

View File

@ -4,14 +4,14 @@
%global failjunit no %global failjunit no
Name: rabbitmq-java-client Name: rabbitmq-java-client
Version: 3.6.5 Version: 3.6.5
Release: 1 Release: 2
Summary: Java Advanced Message Queue Protocol client library Summary: Java Advanced Message Queue Protocol client library
License: ASL 2.0 and GPLv2+ and MPLv1.1 License: ASL 2.0 and GPLv2+ and MPLv1.1
URL: http://www.rabbitmq.com/java-client.html URL: http://www.rabbitmq.com/java-client.html
Source0: http://www.rabbitmq.com/releases/%{name}/v%{version}/%{name}-%{version}.tar.gz Source0: http://www.rabbitmq.com/releases/%{name}/v%{version}/%{name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: maven-local mvn(commons-cli:commons-cli) mvn(commons-io:commons-io) mvn(junit:junit) BuildRequires: maven-local mvn(commons-cli:commons-cli) mvn(commons-io:commons-io) mvn(junit:junit)
BuildRequires: ant ant-junit java-headless python2-devel >= 2.6 python3-simplejson BuildRequires: ant ant-junit java-headless python3-devel >= 2.6 python3-simplejson
%if 0%{?with buildtex} %if 0%{?with buildtex}
BuildRequires: texi2html texlive-base BuildRequires: texi2html texlive-base
%endif %endif
@ -52,7 +52,7 @@ sed -i 's,\(\"haltOnFailureJava\" value=\"\).*\",\1%{failjava}\",' build.xml
%mvn_file com.rabbitmq:amqp-client %{name} %{jarname} amqp-client %mvn_file com.rabbitmq:amqp-client %{name} %{jarname} amqp-client
%build %build
%ant -Dimpl.version=%{version} -Dpython.bin=%{__python2} maven-bundle %ant -Dimpl.version=%{version} -Dpython.bin=%{__python3} maven-bundle
cd doc/channels cd doc/channels
%if 0%{?with buildtex} %if 0%{?with buildtex}
find . -name \*.tex -print -exec 'texi2html {} ; pdflatex {}' \; -delete find . -name \*.tex -print -exec 'texi2html {} ; pdflatex {}' \; -delete
@ -83,5 +83,8 @@ pkill -f rabbitmq_server ||:
%license LICENSE* %license LICENSE*
%changelog %changelog
* Tue Oct 27 2020 Anan Fu <fuanan3@huawei.com> - 3.6.5-2
- disable python2 module
* Wed Aug 26 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 3.6.5-1 * Wed Aug 26 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 3.6.5-1
- Package init - Package init