diff --git a/.gitignore b/.gitignore index 18a3d5a..8bd189f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /abseil-cpp-20230802.1.tar.gz /abseil-cpp-20240116.0.tar.gz /abseil-cpp-20240116.2.tar.gz +/abseil-cpp-20240722.0.tar.gz diff --git a/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch b/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch deleted file mode 100644 index 3875985..0000000 --- a/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7 Mon Sep 17 00:00:00 2001 -From: Benjamin Barenblat -Date: Mon, 10 Jun 2024 10:14:21 -0700 -Subject: [PATCH] Disable negative NaN float ostream format checking on RISC-V -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It’s not clear whether negative NaN floats are supposed to print as -"-nan" or "nan" on RISC-V (https://cplusplus.github.io/LWG/issue4101). -Until that’s resolved, don’t require that logging such a float with -Abseil produce the same result as streaming it to an ostream does. - -Closes: https://github.com/abseil/abseil-cpp/issues/1684 -PiperOrigin-RevId: 641942176 -Change-Id: Iec7ef130cc15c114714f2d124cb37886b3c37ab4 ---- - absl/log/log_format_test.cc | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/absl/log/log_format_test.cc b/absl/log/log_format_test.cc -index dbad5d97615..8ca6df3e586 100644 ---- a/absl/log/log_format_test.cc -+++ b/absl/log/log_format_test.cc -@@ -608,6 +608,19 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) { - auto comparison_stream = ComparisonStream(); - comparison_stream << value; - -+ // On RISC-V, don't expect that formatting -NaN produces the same string as -+ // streaming it. #ifdefing out just the relevant line breaks the MSVC build, -+ // so duplicate the entire EXPECT_CALL. -+#ifdef __riscv -+ EXPECT_CALL( -+ test_sink, -+ Send(AllOf( -+ TextMessage(AnyOf(Eq("-nan"), Eq("nan"), Eq("NaN"), Eq("-nan(ind)"))), -+ ENCODED_MESSAGE( -+ AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"), -+ EqualsProto(R"pb(value { str: "nan" })pb"), -+ EqualsProto(R"pb(value { str: "-nan(ind)" })pb")))))); -+#else - EXPECT_CALL( - test_sink, - Send(AllOf( -@@ -617,6 +630,7 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) { - AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"), - EqualsProto(R"pb(value { str: "nan" })pb"), - EqualsProto(R"pb(value { str: "-nan(ind)" })pb")))))); -+#endif - test_sink.StartCapturingLogs(); - LOG(INFO) << value; - } diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 1959a55..ae15245 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -1,9 +1,9 @@ # Installed library version -%global lib_version 2401.0.0 +%global lib_version 2407.0.0 Name: abseil-cpp -Version: 20240116.2 -Release: 4%{?dist} +Version: 20240722.0 +Release: 1%{?dist} Summary: C++ Common Libraries # The entire source is Apache-2.0, except: @@ -22,16 +22,7 @@ Summary: C++ Common Libraries # (https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/205). License: Apache-2.0 AND LicenseRef-Fedora-Public-Domain URL: https://abseil.io -Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz - -# Disable negative NaN float ostream format checking on RISC-V -# https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7 -# -# Fixes: -# -# [Bug]: NegativeNaN test fails on riscv64 -# https://github.com/abseil/abseil-cpp/issues/1684 -Patch: https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch +Source: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake # The default make backend would work just as well; ninja is observably faster @@ -143,7 +134,9 @@ Development headers for %{name} %{_libdir}/libabsl_crc_cpu_detect.so.%{lib_version} %{_libdir}/libabsl_crc_internal.so.%{lib_version} %{_libdir}/libabsl_debugging_internal.so.%{lib_version} +%{_libdir}/libabsl_decode_rust_punycode.so.%{lib_version} %{_libdir}/libabsl_demangle_internal.so.%{lib_version} +%{_libdir}/libabsl_demangle_rust.so.%{lib_version} %{_libdir}/libabsl_die_if_null.so.%{lib_version} %{_libdir}/libabsl_examine_stack.so.%{lib_version} %{_libdir}/libabsl_exponential_biased.so.%{lib_version} @@ -183,6 +176,7 @@ Development headers for %{name} %{_libdir}/libabsl_low_level_hash.so.%{lib_version} %{_libdir}/libabsl_malloc_internal.so.%{lib_version} %{_libdir}/libabsl_periodic_sampler.so.%{lib_version} +%{_libdir}/libabsl_poison.so.%{lib_version} %{_libdir}/libabsl_random_distributions.so.%{lib_version} %{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version} %{_libdir}/libabsl_random_internal_platform.so.%{lib_version} @@ -211,6 +205,7 @@ Development headers for %{name} %{_libdir}/libabsl_throw_delegate.so.%{lib_version} %{_libdir}/libabsl_time.so.%{lib_version} %{_libdir}/libabsl_time_zone.so.%{lib_version} +%{_libdir}/libabsl_utf8_for_code_point.so.%{lib_version} %{_libdir}/libabsl_vlog_config_internal.so.%{lib_version} %files testing @@ -229,6 +224,8 @@ Development headers for %{name} %{_libdir}/libabsl_log_internal_test_helpers.so.%{lib_version} %{_libdir}/libabsl_log_internal_test_matchers.so.%{lib_version} %{_libdir}/libabsl_scoped_mock_log.so.%{lib_version} +# absl/status/CMakeLists.txt +%{_libdir}/libabsl_status_matchers.so.%{lib_version} # absl/strings/CMakeLists.txt %{_libdir}/libabsl_pow10_helper.so.%{lib_version} # absl/synchronization/CMakeLists.txt @@ -243,6 +240,9 @@ Development headers for %{name} %{_libdir}/pkgconfig/absl_*.pc %changelog +* Sat Aug 03 2024 Benjamin A. Beasley - 20240722.0-1 +- Update to 20240722.0 (close RHBZ#2302537) + * Wed Jul 17 2024 Fedora Release Engineering - 20240116.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 1ee649b..842d69a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abseil-cpp-20240116.2.tar.gz) = 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e +SHA512 (abseil-cpp-20240722.0.tar.gz) = bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31