diff --git a/3000-etcd-3.4.14-sw.patch b/1000-add-sw_64-support-not-upstream-new-files.patch similarity index 100% rename from 3000-etcd-3.4.14-sw.patch rename to 1000-add-sw_64-support-not-upstream-new-files.patch diff --git a/etcd.spec b/etcd.spec index 74700ecf3798521c1bde3299c9cd96f1adf61796..85eba11ffb82708afed803501f76e3f4f8573024 100644 --- a/etcd.spec +++ b/etcd.spec @@ -31,7 +31,7 @@ system.} %global gosupfiles integration/fixtures/* etcdserver/api/v2http/testdata/* Name: etcd -Release: 5 +Release: 6 Summary: Distributed reliable key-value store for the most critical data of a distributed system # Upstream license specification: Apache-2.0 @@ -44,12 +44,12 @@ Source3: man-%{man_version}.tar.gz # sh genmanpages.sh path_to_built_source Source10: genmanpages.sh # add support for loongarch64 -Source3000: bbolt-1.3.7.tar.gz +Source1000: bbolt-1.3.7.tar.gz # update grpc-go version to v1.32.0 Patch1: 0001-Convert-int-to-string-using-strconv.Itoa.patch Patch2: 0002-Etcd-on-unsupported-platform-without-ETCD_UNSUPPORTED_ARCH=arm64-set.patch # add support for sw_64 -Patch3000: 3000-etcd-3.4.14-sw.patch +Patch1000: 1000-add-sw_64-support-not-upstream-new-files.patch BuildRequires: golang BuildRequires: python3-devel %{?systemd_requires} @@ -66,7 +66,7 @@ Requires(pre): shadow-utils %forgesetup %patch1 -p1 %patch2 -p1 -%patch3000 -p1 +%patch1000 -p1 # For compatibility cp -aR etcdserver/api/snap snap cp -aR etcdserver/api/membership etcdserver/membership @@ -84,7 +84,7 @@ cp ../man-%{man_version}/*.1 man/man1/. cp -af %{_prefix}/lib/golang/src/cmd/vendor/golang.org/x/sys vendor/golang.org/x/ %endif %ifarch loongarch64 -tar xf %{SOURCE3000} -C vendor/go.etcd.io/bbolt/ +tar xf %{SOURCE1000} -C vendor/go.etcd.io/bbolt/ %endif %if %{without bootstrap} @@ -171,8 +171,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog -* Mon Aug 14 2023 herengui - 3.4.14-5 -- add support for loongarch64 and sw_64 +* Fri Sep 22 2023 panchenbo - 3.4.14-6 +- add support for loongarch64 and modify sw_64 patch + +* Wed Oct 19 2022 wuzx - 3.4.14-5 +- add sw64 patch * Wed Sep 2021 jikui - 3.4.14-4 - modify build flags for secure compilation options