From 74997349927557eeb433de61be45d7b019379500 Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 23 Dec 2020 15:55:56 +0800 Subject: [PATCH 1/2] Add npm.taobao repo --- 0001-add-npm.tobao-repo.patch | 32 ++++++++++++++++++++++++++++++++ flink.spec | 9 +++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 0001-add-npm.tobao-repo.patch diff --git a/0001-add-npm.tobao-repo.patch b/0001-add-npm.tobao-repo.patch new file mode 100644 index 0000000..19bd244 --- /dev/null +++ b/0001-add-npm.tobao-repo.patch @@ -0,0 +1,32 @@ +From a35c34c6591366ddaccc873b800b078fbd9cc9d7 Mon Sep 17 00:00:00 2001 +From: weidong +Date: Thu, 17 Dec 2020 11:44:05 +0800 +Subject: [PATCH] add npm.tobao repo + +--- + flink-runtime-web/pom.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml +index 0d98526b..fb29809b 100644 +--- a/flink-runtime-web/pom.xml ++++ b/flink-runtime-web/pom.xml +@@ -271,6 +271,7 @@ under the License. + + + ci --cache-max=0 --no-save ++ https://registry.npm.taobao.org + + true + +@@ -283,6 +284,7 @@ under the License. + + + run build ++ https://registry.npm.taobao.org + + + +-- +2.23.0 + diff --git a/flink.spec b/flink.spec index 1967ade..4a68c76 100644 --- a/flink.spec +++ b/flink.spec @@ -11,12 +11,13 @@ Name: flink Version: 1.12.0 -Release: 2 +Release: 3 Summary: Stateful Computations over Data Streams License: Apache License v2.0 URL: https://github.com/apache/%{name} Source0: https://github.com/apache/%{name}/archive/release-%{version}.tar.gz Source1: settings.xml +Patch0: 0001-add-npm.tobao-repo.patch BuildRequires: java-1.8.0-openjdk-devel maven Requires: java-1.8.0-openjdk @@ -30,7 +31,7 @@ Apache Flink is a framework and distributed processing engine for stateful compu %build -maven_cmd="clean package -Dskip.npm " +maven_cmd="clean package " %if 0%{?compile_for_local} cp %{SOURCE1} ./ @@ -52,6 +53,7 @@ mkdir -p %{buildroot}/opt/ cp -rf ../%{name}-release-%{version}/flink-dist/target/%{name}-%{version}-bin/%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i sed -i 's/\#!\/usr\/bin\/env python$/\#!\/usr\/bin\/python3/' {} +# sed -i 's/\#!\/usr\/bin\/python$/\#!\/usr\/bin\/python3/' %{buildroot}/opt/apache-%{name}-%{version}/flink-runtime-web/web-dashboard/node_modules/node-gyp/gyp/samples/samples %files /opt/apache-%{name}-%{version} @@ -59,6 +61,9 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i %license LICENSE %changelog +* Wed Dec 23 2020 weidong - 1.12.0-3 +- Add npm.taobao repo. + * Thu Dec 17 2020 weidong - 1.12.0-2 - Fix compilation issues. -- Gitee From 119a88dc0df334042c9cbbd06ba4a501d622dd68 Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 23 Dec 2020 17:23:23 +0800 Subject: [PATCH 2/2] 1 --- 0001-add-npm.hw-repo.patch | 32 ++++++++++++++++++++++++++++++++ flink.spec | 5 ++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 0001-add-npm.hw-repo.patch diff --git a/0001-add-npm.hw-repo.patch b/0001-add-npm.hw-repo.patch new file mode 100644 index 0000000..6cf3bdc --- /dev/null +++ b/0001-add-npm.hw-repo.patch @@ -0,0 +1,32 @@ +From a35c34c6591366ddaccc873b800b078fbd9cc9d7 Mon Sep 17 00:00:00 2001 +From: weidong +Date: Thu, 17 Dec 2020 11:44:05 +0800 +Subject: [PATCH] add npm.hw repo + +--- + flink-runtime-web/pom.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml +index 0d98526b..fb29809b 100644 +--- a/flink-runtime-web/pom.xml ++++ b/flink-runtime-web/pom.xml +@@ -271,6 +271,7 @@ under the License. + + + ci --cache-max=0 --no-save ++ https://mirrors.huaweicloud.com/repository/npm + + true + +@@ -283,6 +284,7 @@ under the License. + + + run build ++ https://mirrors.huaweicloud.com/repository/npm + + + +-- +2.23.0 + diff --git a/flink.spec b/flink.spec index 4a68c76..7c24cec 100644 --- a/flink.spec +++ b/flink.spec @@ -17,7 +17,7 @@ License: Apache License v2.0 URL: https://github.com/apache/%{name} Source0: https://github.com/apache/%{name}/archive/release-%{version}.tar.gz Source1: settings.xml -Patch0: 0001-add-npm.tobao-repo.patch +Patch0: 0001-add-npm.hw-repo.patch BuildRequires: java-1.8.0-openjdk-devel maven Requires: java-1.8.0-openjdk @@ -53,7 +53,6 @@ mkdir -p %{buildroot}/opt/ cp -rf ../%{name}-release-%{version}/flink-dist/target/%{name}-%{version}-bin/%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i sed -i 's/\#!\/usr\/bin\/env python$/\#!\/usr\/bin\/python3/' {} -# sed -i 's/\#!\/usr\/bin\/python$/\#!\/usr\/bin\/python3/' %{buildroot}/opt/apache-%{name}-%{version}/flink-runtime-web/web-dashboard/node_modules/node-gyp/gyp/samples/samples %files /opt/apache-%{name}-%{version} @@ -62,7 +61,7 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i %changelog * Wed Dec 23 2020 weidong - 1.12.0-3 -- Add npm.taobao repo. +- Add npm.huawei repo. * Thu Dec 17 2020 weidong - 1.12.0-2 - Fix compilation issues. -- Gitee