From 690075552a7da3d91e338bc753b4173f9142a87b Mon Sep 17 00:00:00 2001 From: fwx913451 Date: Fri, 30 Oct 2020 11:08:25 +0800 Subject: [PATCH 1/2] Delete python2 platform --- rabbitmq-java-client.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rabbitmq-java-client.spec b/rabbitmq-java-client.spec index 50efec5..bf08733 100644 --- a/rabbitmq-java-client.spec +++ b/rabbitmq-java-client.spec @@ -11,7 +11,7 @@ URL: http://www.rabbitmq.com/java-client.html Source0: http://www.rabbitmq.com/releases/%{name}/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch 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} BuildRequires: texi2html texlive-base %endif @@ -52,7 +52,7 @@ sed -i 's,\(\"haltOnFailureJava\" value=\"\).*\",\1%{failjava}\",' build.xml %mvn_file com.rabbitmq:amqp-client %{name} %{jarname} amqp-client %build -%ant -Dimpl.version=%{version} -Dpython.bin=%{__python2} maven-bundle +%ant -Dimpl.version=%{version} -Dpython.bin=%{__python3} maven-bundle cd doc/channels %if 0%{?with buildtex} find . -name \*.tex -print -exec 'texi2html {} ; pdflatex {}' \; -delete @@ -83,5 +83,5 @@ pkill -f rabbitmq_server ||: %license LICENSE* %changelog -* Wed Aug 26 2020 shaoqiang kang - 3.6.5-1 -- Package init +* Tue Oct 27 2020 Anan Fu - 3.6.5-1 +- Delete python2 platform -- Gitee From e4b6f37bdd528e725e043666f311922e91cc8602 Mon Sep 17 00:00:00 2001 From: fwx913451 Date: Fri, 30 Oct 2020 11:32:52 +0800 Subject: [PATCH 2/2] Disable python2 module --- rabbitmq-java-client.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rabbitmq-java-client.spec b/rabbitmq-java-client.spec index bf08733..2659a7d 100644 --- a/rabbitmq-java-client.spec +++ b/rabbitmq-java-client.spec @@ -83,5 +83,8 @@ pkill -f rabbitmq_server ||: %license LICENSE* %changelog -* Tue Oct 27 2020 Anan Fu - 3.6.5-1 -- Delete python2 platform +* Tue Oct 27 2020 Anan Fu - 3.6.5-2 +- Disable python2 module + +* Wed Aug 26 2020 shaoqiang kang - 3.6.5-1 +- Package init -- Gitee