From fcf86db54b24e3e6a6823cd6a2532da152a03db1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 26 Apr 2023 17:18:30 -0400 Subject: [PATCH] Stop packaging static libraries Nothing currently uses them, and the guidelines discourage packaging them: https://docs.fedoraproject.org/en-US/packaging-guidelines/#packaging-static-libraries --- protobuf.spec | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/protobuf.spec b/protobuf.spec index dc895de..63132db 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -19,7 +19,7 @@ Name: protobuf # “patch” updates of protobuf. Version: 3.19.6 %global so_version 30 -Release: 3%{?dist} +Release: 4%{?dist} # The entire source is BSD-3-Clause, except the following files, which belong # to the build system; are unpackaged maintainer utility scripts; or are used @@ -139,17 +139,12 @@ Requires: protobuf = %{version}-%{release} Requires: protobuf-compiler = %{version}-%{release} Requires: zlib-devel +Obsoletes: protobuf-static < 3.19.6-4 + %description devel This package contains Protocol Buffers compiler for all languages and C++ headers and libraries -%package static -Summary: Static development files for protobuf -Requires: protobuf-devel = %{version}-%{release} - -%description static -Static libraries for Protocol Buffers - %package lite Summary: Protocol Buffers LITE_RUNTIME libraries @@ -165,6 +160,8 @@ Summary: Protocol Buffers LITE_RUNTIME development libraries Requires: protobuf-devel = %{version}-%{release} Requires: protobuf-lite = %{version}-%{release} +Obsoletes: protobuf-lite-static < 3.19.6-4 + %description lite-devel This package contains development libraries built with optimize_for = LITE_RUNTIME. @@ -173,18 +170,6 @@ The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code which only depends libprotobuf-lite, which is much smaller than libprotobuf but lacks descriptors, reflection, and some other features. -%package lite-static -Summary: Static development files for protobuf-lite -Requires: protobuf-devel = %{version}-%{release} - -%description lite-static -This package contains static development libraries built with -optimize_for = LITE_RUNTIME. - -The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code -which only depends libprotobuf-lite, which is much smaller than libprotobuf but -lacks descriptors, reflection, and some other features. - %if %{with python} %package -n python3-protobuf Summary: Python bindings for Google Protocol Buffers @@ -334,7 +319,7 @@ iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8 mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt export PTHREAD_LIBS="-lpthread" ./autogen.sh -%configure +%configure --disable-static # -Wno-error=type-limits: # https://bugzilla.redhat.com/show_bug.cgi?id=1838470 @@ -418,10 +403,6 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %{_emacs_sitelispdir}/protobuf/ %{_emacs_sitestartdir}/protobuf-init.el -%files static -%{_libdir}/libprotobuf.a -%{_libdir}/libprotoc.a - %files lite %license LICENSE %{_libdir}/libprotobuf-lite.so.%{so_version}{,.*} @@ -430,9 +411,6 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %{_libdir}/libprotobuf-lite.so %{_libdir}/pkgconfig/protobuf-lite.pc -%files lite-static -%{_libdir}/libprotobuf-lite.a - %if %{with python} %files -n python3-protobuf %if %{with python_cpp} @@ -480,6 +458,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %changelog +* Wed Apr 26 2023 Benjamin A. Beasley - 3.19.6-4 +- Stop packaging static libraries + * Tue Apr 25 2023 Benjamin A. Beasley - 3.19.6-3 - Remove unnecessary explicit pkgconfig dependencies - Remove an obsolete workaround for failing Java tests