diff --git a/.gitignore b/.gitignore index 3105c84..3de6a46 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /grpc-1.20.1.tar.gz /grpc-1.26.0.tar.gz /release-1.10.0.tar.gz +/googletest-release-1.10.0.tar.gz diff --git a/grpc.spec b/grpc.spec index e583d78..ed28f35 100644 --- a/grpc.spec +++ b/grpc.spec @@ -29,7 +29,7 @@ Name: grpc Version: 1.26.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: RPC library and framework # CMakeLists.txt: gRPC_CORE_SOVERSION @@ -77,7 +77,9 @@ URL: https://www.%{name}.io Source0: %{forgeurl}/archive/v%{version}/%{name}-%{version}.tar.gz # Used only at build time (not a bundled library); see notes at definition of # gtest_version macro for explanation and justification. -Source1: https://github.com/google/googletest/archive/release-%{gtest_version}.tar.gz +%global gtest_url https://github.com/google/googletest +%global gtest_archivename googletest-release-%{gtest_version} +Source1: https://github.com/google/googletest/archive/release-%{gtest_version}/%{gtest_archivename}.tar.gz # ~~~~ C (core) and C++ (cpp) ~~~~ @@ -442,7 +444,7 @@ sed -i \ # Copy in the needed gtest/gmock implementations. %setup -q -T -D -b 1 rm -rvf 'third_party/googletest' -mv '../googletest-release-%{gtest_version}' 'third_party/googletest' +mv '../%{gtest_archivename}' 'third_party/googletest' %else # Patch CMakeLists for external gtest/gmock. # @@ -1124,6 +1126,10 @@ fi %changelog +* Thu Mar 25 2021 Benjamin A. Beasley - 1.26.0-14 +- General: + * Improved googletest source URL (better tarball name) + * Tue Mar 23 2021 Benjamin A. Beasley - 1.26.0-13 - General: * Replace * with • in descriptions diff --git a/sources b/sources index 23ba531..818c148 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (grpc-1.26.0.tar.gz) = 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb -SHA512 (release-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9 +SHA512 (googletest-release-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9