include all patches in the source package.

(cherry picked from commit 29fbc7c1d12de375b18ad36f21e9f5d95b7554e8)
This commit is contained in:
沈仲伟 2024-12-10 10:00:07 +08:00 committed by openeuler-sync-bot
parent ba2e3406d8
commit 4834d918e1

View File

@ -11,7 +11,7 @@
Name: flink Name: flink
Version: 1.17.1 Version: 1.17.1
Release: 4 Release: 5
Summary: Stateful Computations over Data Streams Summary: Stateful Computations over Data Streams
License: Apache License v2.0 License: Apache License v2.0
URL: https://github.com/apache/%{name} URL: https://github.com/apache/%{name}
@ -30,12 +30,12 @@ Patch1: 0002-fix-compilation-failure.patch
Patch2: 0003-Skip-flink-avro-confluent-registry-test.patch Patch2: 0003-Skip-flink-avro-confluent-registry-test.patch
Patch3: 0004-update-npm.hw-repo.patch Patch3: 0004-update-npm.hw-repo.patch
Patch4: 0005-upgrade-os-maven-plugin-to-1.7.1.patch Patch4: 0005-upgrade-os-maven-plugin-to-1.7.1.patch
Patch1000: 1000-Add-protoc-java-support-for-riscv64.patch
Patch1001: 1001-Added-support-for-building-the-riscv64-protoc-binari.patch
BuildRequires: java-1.8.0-openjdk-devel maven npm BuildRequires: java-1.8.0-openjdk-devel maven npm
Requires: java-1.8.0-openjdk Requires: java-1.8.0-openjdk
%ifarch riscv64 %ifarch riscv64
BuildRequires: autoconf automake libtool pkgconfig zlib-devel libstdc++-static gcc-c++ BuildRequires: autoconf automake libtool pkgconfig zlib-devel libstdc++-static gcc-c++
Patch1000: 1000-Add-protoc-java-support-for-riscv64.patch
Patch1001: 1001-Added-support-for-building-the-riscv64-protoc-binari.patch
%endif %endif
%description %description
@ -70,7 +70,8 @@ pushd ${HOME}/%{name}-prep_dir/protoc-jar-maven-plugin-3.11.4
mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
popd popd
%else %else
%autosetup -p1 -n %{name}-release-%{version} %setup -n %{name}-release-%{version}
%autopatch -M999 -p1
%endif %endif
mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-registry-client -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE2} mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-schema-registry-client -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE2}
mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-avro-serializer -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE3} mvn install:install-file -DgroupId=io.confluent -DartifactId=kafka-avro-serializer -Dversion=7.2.2 -Dpackaging=jar -Dfile=%{SOURCE3}
@ -101,6 +102,9 @@ find %{buildroot}/opt/apache-%{name}-%{version}/ -type f -name '*.py' | xargs -i
%license LICENSE %license LICENSE
%changelog %changelog
* Tue Dec 10 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 1.17.1-5
- include all patches in the source package.
* Tue Jun 25 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.17.1-4 * Tue Jun 25 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.17.1-4
- Remove riscv64 prebuilded files - Remove riscv64 prebuilded files
- Build protoc, protoc-jar and protoc-jar-maven-plugin in prep state for riscv64 - Build protoc, protoc-jar and protoc-jar-maven-plugin in prep state for riscv64