From 6fe62a9b20860ca7233a87891c99534698a2fe36 Mon Sep 17 00:00:00 2001 From: gaochong Date: Thu, 29 Jul 2021 11:22:07 +0800 Subject: [PATCH] fix issue: https://gitee.com/src-openeuler/kafka/issues/I42WT1 Signed-off-by: gaochong --- gradle-modify-url-to-aliyun.patch | 37 +++++++++++++++++++++++++++++++ kafka.spec | 13 ++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gradle-modify-url-to-aliyun.patch diff --git a/gradle-modify-url-to-aliyun.patch b/gradle-modify-url-to-aliyun.patch new file mode 100644 index 0000000..cbcf8f2 --- /dev/null +++ b/gradle-modify-url-to-aliyun.patch @@ -0,0 +1,37 @@ +From 62254f5a26c3bc2c4afc4990434ea3e958c3135e Mon Sep 17 00:00:00 2001 +From: gaochong +Date: Thu, 19 Nov 2020 15:47:00 +0800 +Subject: [PATCH] modify url + +--- + build.gradle | 2 ++ + gradle/wrapper/gradle-wrapper.properties | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build.gradle b/build.gradle +index 5ed1e84..2852b57 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -21,6 +21,8 @@ buildscript { + repositories { + mavenCentral() + jcenter() ++ maven { url 'https://maven.aliyun.com/repository/google/'} ++ maven { url 'https://maven.aliyun.com/repository/jcenter/'} + maven { + url "https://plugins.gradle.org/m2/" + } +diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties +index 186b715..1fc225a 100644 +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip ++distributionUrl=https\://code.aliyun.com/kar/gradle-all-zip/raw/master/gradle-6.5-all.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists +-- +2.20.1 + diff --git a/kafka.spec b/kafka.spec index c2bd2ae..f8647f1 100644 --- a/kafka.spec +++ b/kafka.spec @@ -4,13 +4,17 @@ Name: kafka Version: 2.6.0 -Release: 2 +Release: 3 Summary: A Distributed Streaming Platform. License: Apache License, Version 2.0 Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}-src.tgz Source1: https://services.gradle.org/distributions/gradle-6.5-bin.zip Source2: kafka.service +Source3: gradle-wrapper.jar +Source4: requires.zip + +Patch0: gradle-modify-url-to-aliyun.patch BuildRequires: systemd java-1.8.0-openjdk-devel Provides: kafka = %{version} @@ -28,9 +32,13 @@ exit 0 %prep %setup -q -n %{name}-%{version}-src +%patch0 -p1 %build unzip -q $RPM_SOURCE_DIR/gradle-6.5-bin.zip +cp $RPM_SOURCE_DIR/gradle-wrapper.jar ./gradle/wrapper +unzip -q $RPM_SOURCE_DIR/requires.zip +export GRADLE_USER_HOME=./requires ./gradle-6.5/bin/gradle ./gradlew jar @@ -56,6 +64,9 @@ cp -n */*/build/dependant-libs*/* $RPM_BUILD_ROOT%{kafka_home}/libs rm -rf %{buildroot} %changelog +* Thu 29 Jul 2021 gaochong 2.6.0 - 3 +- add/modify maven repository URL with aliyun + * Thu Mar 25 2021 huanghaitao 2.6.0 - 2 - Remove dist macros -- Gitee