From a0a8a84664c79f54c28d919273d80686a54ed0b61a234f169e56c635e225996f Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Mon, 6 May 2024 08:36:59 +0000 Subject: [PATCH] Accepting request 1169729 from home:dirkmueller:Factory - split abseil libraries so that libzypp / protobuf doesn't require all to be installed (jsc#PED-8153) OBS-URL: https://build.opensuse.org/request/show/1169729 OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=35 --- abseil-cpp.changes | 6 +++ abseil-cpp.spec | 130 ++++++++++++++++++++++++++++++++++++++++++--- baselibs.conf | 3 +- 3 files changed, 130 insertions(+), 9 deletions(-) diff --git a/abseil-cpp.changes b/abseil-cpp.changes index 5359614..b3b73bd 100644 --- a/abseil-cpp.changes +++ b/abseil-cpp.changes @@ -12,6 +12,12 @@ Thu Apr 11 20:12:22 UTC 2024 - Andreas Stieger * Breaking change: absl::weak_equality and absl::strong_equality have been removed +------------------------------------------------------------------- +Tue Apr 2 13:01:58 UTC 2024 - Dirk Müller + +- split abseil libraries so that libzypp / protobuf doesn't + require all to be installed (jsc#PED-8153) + ------------------------------------------------------------------- Mon Mar 4 10:30:53 UTC 2024 - Fridrich Strba diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 423aada..78fe62a 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -16,7 +16,8 @@ # -%define lname libabsl2401_0_0 +%global soversion so.2401.0.0 +%global lname_suffix 2401_0_0 %if 0%{?gcc_version} < 7 %global with_gcc 7 %endif @@ -46,19 +47,33 @@ Abseil is a collection of C++11 libraries which augment the C++ standard library. It also provides features incorporated into C++14 and C++17 standards. -%package -n %{lname} -Summary: C++11 libraries which augment the C++ stdlib +%package -n libabsl_lite_%{lname_suffix} +Summary: C++11 libraries which augment the C++ stdlib - lite Obsoletes: abseil-cpp < %{version}-%{release} Provides: abseil-cpp = %{version}-%{release} -%description -n %{lname} +%description -n libabsl_lite_%{lname_suffix} +Abseil is a collection of C++11 libraries which augment the C++ +standard library. It also provides features incorporated into C++14 +and C++17 standards. + +This package provides the subset needed by protobuf-lite. + +%package -n libabsl_%{lname_suffix} +Summary: C++11 libraries which augment the C++ stdlib - others +Obsoletes: abseil-cpp < %{version}-%{release} +Obsoletes: libabsl2401_0_0 < %{version}-%{release} +Provides: abseil-cpp = %{version}-%{release} + +%description -n libabsl_%{lname_suffix} Abseil is a collection of C++11 libraries which augment the C++ standard library. It also provides features incorporated into C++14 and C++17 standards. %package devel Summary: Header files for Abseil -Requires: %{lname} = %{version} +Requires: libabsl_%{lname_suffix} +Requires: libabsl_lite_%{lname_suffix} %description devel Abseil is a collection of C++11 libraries which augment the C++ @@ -83,11 +98,110 @@ export CXX="g++-%{with_gcc}" %check %ctest -%ldconfig_scriptlets -n %{lname} +# SLE12 doed not define this macro +%if %{undefined ldconfig_scriptlets} +%post -n libabsl_lite_%{lname_suffix} -p /sbin/ldconfig +%postun -n libabsl_lite_%{lname_suffix} -p /sbin/ldconfig -%files -n %{lname} +%post -n libabsl_%{lname_suffix} -p /sbin/ldconfig +%postun -n libabsl_%{lname_suffix} -p /sbin/ldconfig + +%else +%ldconfig_scriptlets -n libabsl_lite_%{lname_suffix} +%ldconfig_scriptlets -n libabsl_%{lname_suffix} +%endif + +%files -n libabsl_lite_%{lname_suffix} %license LICENSE -%{_libdir}/libabsl_*.so.* +%{_libdir}/libabsl_base.%{soversion} +%{_libdir}/libabsl_city.%{soversion} +%{_libdir}/libabsl_cord.%{soversion} +%{_libdir}/libabsl_cord_internal.%{soversion} +%{_libdir}/libabsl_cordz_functions.%{soversion} +%{_libdir}/libabsl_cordz_handle.%{soversion} +%{_libdir}/libabsl_cordz_info.%{soversion} +%{_libdir}/libabsl_crc32c.%{soversion} +%{_libdir}/libabsl_crc_cord_state.%{soversion} +%{_libdir}/libabsl_crc_internal.%{soversion} +%{_libdir}/libabsl_debugging_internal.%{soversion} +%{_libdir}/libabsl_demangle_internal.%{soversion} +%{_libdir}/libabsl_examine_stack.%{soversion} +%{_libdir}/libabsl_exponential_biased.%{soversion} +%{_libdir}/libabsl_hash.%{soversion} +%{_libdir}/libabsl_int128.%{soversion} +%{_libdir}/libabsl_kernel_timeout_internal.%{soversion} +%{_libdir}/libabsl_log_globals.%{soversion} +%{_libdir}/libabsl_log_internal_check_op.%{soversion} +%{_libdir}/libabsl_log_internal_format.%{soversion} +%{_libdir}/libabsl_log_internal_globals.%{soversion} +%{_libdir}/libabsl_log_internal_log_sink_set.%{soversion} +%{_libdir}/libabsl_log_internal_message.%{soversion} +%{_libdir}/libabsl_log_internal_nullguard.%{soversion} +%{_libdir}/libabsl_log_internal_proto.%{soversion} +%{_libdir}/libabsl_log_sink.%{soversion} +%{_libdir}/libabsl_low_level_hash.%{soversion} +%{_libdir}/libabsl_malloc_internal.%{soversion} +%{_libdir}/libabsl_raw_hash_set.%{soversion} +%{_libdir}/libabsl_raw_logging_internal.%{soversion} +%{_libdir}/libabsl_spinlock_wait.%{soversion} +%{_libdir}/libabsl_stacktrace.%{soversion} +%{_libdir}/libabsl_str_format_internal.%{soversion} +%{_libdir}/libabsl_strerror.%{soversion} +%{_libdir}/libabsl_string_view.%{soversion} +%{_libdir}/libabsl_strings.%{soversion} +%{_libdir}/libabsl_strings_internal.%{soversion} +%{_libdir}/libabsl_symbolize.%{soversion} +%{_libdir}/libabsl_synchronization.%{soversion} +%{_libdir}/libabsl_throw_delegate.%{soversion} +%{_libdir}/libabsl_time.%{soversion} +%{_libdir}/libabsl_time_zone.%{soversion} + +%files -n libabsl_%{lname_suffix} +%license LICENSE +%{_libdir}/libabsl_bad_any_cast_impl.%{soversion} +%{_libdir}/libabsl_bad_optional_access.%{soversion} +%{_libdir}/libabsl_bad_variant_access.%{soversion} +%{_libdir}/libabsl_civil_time.%{soversion} +%{_libdir}/libabsl_cordz_sample_token.%{soversion} +%{_libdir}/libabsl_crc_cpu_detect.%{soversion} +%{_libdir}/libabsl_die_if_null.%{soversion} +%{_libdir}/libabsl_failure_signal_handler.%{soversion} +%{_libdir}/libabsl_flags_commandlineflag_internal.%{soversion} +%{_libdir}/libabsl_flags_commandlineflag.%{soversion} +%{_libdir}/libabsl_flags_config.%{soversion} +%{_libdir}/libabsl_flags_internal.%{soversion} +%{_libdir}/libabsl_flags_marshalling.%{soversion} +%{_libdir}/libabsl_flags_parse.%{soversion} +%{_libdir}/libabsl_flags_private_handle_accessor.%{soversion} +%{_libdir}/libabsl_flags_program_name.%{soversion} +%{_libdir}/libabsl_flags_reflection.%{soversion} +%{_libdir}/libabsl_flags_usage_internal.%{soversion} +%{_libdir}/libabsl_flags_usage.%{soversion} +%{_libdir}/libabsl_graphcycles_internal.%{soversion} +%{_libdir}/libabsl_hashtablez_sampler.%{soversion} +%{_libdir}/libabsl_leak_check.%{soversion} +%{_libdir}/libabsl_log_entry.%{soversion} +%{_libdir}/libabsl_log_flags.%{soversion} +%{_libdir}/libabsl_log_initialize.%{soversion} +%{_libdir}/libabsl_log_internal_conditions.%{soversion} +%{_libdir}/libabsl_log_internal_fnmatch.%{soversion} +%{_libdir}/libabsl_log_severity.%{soversion} +%{_libdir}/libabsl_periodic_sampler.%{soversion} +%{_libdir}/libabsl_random_distributions.%{soversion} +%{_libdir}/libabsl_random_internal_distribution_test_util.%{soversion} +%{_libdir}/libabsl_random_internal_platform.%{soversion} +%{_libdir}/libabsl_random_internal_pool_urbg.%{soversion} +%{_libdir}/libabsl_random_internal_randen_hwaes_impl.%{soversion} +%{_libdir}/libabsl_random_internal_randen_hwaes.%{soversion} +%{_libdir}/libabsl_random_internal_randen_slow.%{soversion} +%{_libdir}/libabsl_random_internal_randen.%{soversion} +%{_libdir}/libabsl_random_internal_seed_material.%{soversion} +%{_libdir}/libabsl_random_seed_gen_exception.%{soversion} +%{_libdir}/libabsl_random_seed_sequences.%{soversion} +%{_libdir}/libabsl_scoped_set_env.%{soversion} +%{_libdir}/libabsl_statusor.%{soversion} +%{_libdir}/libabsl_status.%{soversion} +%{_libdir}/libabsl_vlog_config_internal.%{soversion} %files devel %license LICENSE diff --git a/baselibs.conf b/baselibs.conf index 836d8cb..51fd87a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,2 @@ -libabsl2401_0_0 +libabsl_lite_2401_0_0 +libabsl_2401_0_0