diff --git a/pulsar.spec b/pulsar.spec index 577b504a4f9da704def74fd0a796d6fa9d5dbf47..3e35f465c6b6a96ad09a7d204e0e686cff479f2e 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} %define pulsar_ver 2.10.6 -%define pkg_ver 3 +%define pkg_ver 4 %define _prefix /opt/pulsar Summary: Cloud-Native, Distributed Messaging and Streaming Name: pulsar @@ -51,7 +51,7 @@ mkdir -p ${HOME}/%{name}-prep_dir # protoc tar -mxf %{SOURCE1} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/protobuf-3.19.6 -%patch1000 -p1 +%patch 1000 -p1 ./autogen.sh ./protoc-artifacts/build-protoc.sh linux riscv64 protoc mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.19.6 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe @@ -63,7 +63,7 @@ cp %{SOURCE3} %{_tmppath}/source tar xzf %{SOURCE4} -C %{_tmppath}/source tar -mxf %{SOURCE5} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/protobuf-3.19.2 -%patch1003 -p1 +%patch 1003 -p1 ./autogen.sh ./protoc-artifacts/build-protoc.sh linux riscv64 protoc mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.19.2 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe @@ -72,8 +72,8 @@ popd # protoc-gen-grpc-java tar -mxf %{SOURCE2} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/grpc-java-1.45.1 -%patch1001 -p1 -%patch1002 -p1 +%patch 1001 -p1 +%patch 1002 -p1 sed -i "s,@HOME@,${HOME},g" build.gradle sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh @@ -82,15 +82,15 @@ popd %endif %setup -q -n apache-pulsar-%{version}-src -%patch0001 -p1 -%patch0002 -p1 -%patch0003 -p1 -%patch0004 -p1 -%patch0005 -p1 +%patch 0001 -p1 +%patch 0002 -p1 +%patch 0003 -p1 +%patch 0004 -p1 +%patch 0005 -p1 %ifarch riscv64 -%patch0006 -p1 -%patch0007 -p1 +%patch 0006 -p1 +%patch 0007 -p1 %endif %build @@ -122,6 +122,9 @@ getent passwd pulsar >/dev/null || useradd -r -g pulsar -d / -s /sbin/nologin pu exit 0 %changelog +* Thu Dec 05 2024 shenzhongwei - 2.10.6-4 +- fix: %patchN is deprecated (11 usages found), use %patch N (or %patch -P N) + * Wed Dec 04 2024 yangzhenyu - 2.10.6-3 - remove the architecture judgment in the patches section; - include all patches in the source package.