diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 1914e86..73c8f05 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -65,6 +65,18 @@ BuildRequires: gcc-c++ BuildRequires: gmock-devel BuildRequires: gtest-devel +# The contents of absl/time/internal/cctz are derived from +# https://github.com/google/cctz (https://src.fedoraproject.org/rpms/cctz), but +# have been forked with Abseil-specific changes. It is not obvious from which +# particular version of CCTZ these sources are derived. Upstream was asked +# about a path to supporting a system copy as required by bundling guidelines: +# Please comment on CCTZ bundling +# https://github.com/abseil/abseil-cpp/discussions/1415 +# They refused, for the time being, as follows: +# “[…] we have no plans to change this decision, but we reserve the right to +# change our minds.” +Provides: bundled(cctz) + %ifarch s390x # Symbolize.SymbolizeWithMultipleMaps fails in absl_symbolize_test on s390x # with LTO @@ -91,6 +103,10 @@ and we now want to provide those resources to the C++ community as a whole. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +# Some of the headers from CCTZ are part of the -devel subpackage. See the +# corresponding virtual Provides in the base package for full details. +Provides: bundled(cctz) + %description devel Development headers for %{name} @@ -140,6 +156,7 @@ find . -type f -name '*.cc' \ %changelog * Sat Jan 25 2025 Benjamin A. Beasley - 20211102.0-4 - Update License to SPDX +- Indicate CCTZ bundling * Fri Jul 29 2022 Benjamin A. Beasley - 20211102.0-3 - Do not leak -maes -msse4.1 into pkgconfig (fix RHBZ#2108658)