diff --git a/protobuf.spec b/protobuf.spec index d65739a..e7b4388 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -1,5 +1,5 @@ Name: protobuf -Version: 25.3 +Version: 26.1 Release: 1mamba Summary: A way of encoding structured data in an efficient yet extensible format Group: Development/Tools @@ -16,11 +16,11 @@ License: BSD BuildRequires: glibc-devel BuildRequires: libabseil-cpp-devel BuildRequires: libgcc -BuildRequires: libpython311-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: protobuf26 <= 3.15.8-2mamba %description Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. @@ -28,6 +28,7 @@ Protocol Buffers are a way of encoding structured data in an efficient yet exten %package -n lib%{name} Group: System/Libraries Summary: Shared libraries for %{name} +Obsoletes: libprotobuf26 <= 3.15.8-2mamba %description -n lib%{name} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. @@ -40,22 +41,11 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Provides: protobuf-devel Obsoletes: protobuf-devel < 3.17.0 +Obsoletes: libprotobuf26-devel <= 3.15.8-2mamba %description -n lib%{name}-devel This package contains static libraries and header files needed for development of Protocol Buffer -%package -n python-%{name}-py3 -Summary: Python bindings for %{name} -Group: System/Libraries/Python -Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} -Provides: python-protobuf -Obsoletes: python-protobuf <= 21.12-1mamba -Provides: python-protobuf-py310 -Obsoletes: python-protobuf-py310 < 25.3 - -%description -n python-%{name}-py3 -This package contains the python bindings to %{protobuf} library. - %debug_package %prep @@ -64,7 +54,7 @@ This package contains the python bindings to %{protobuf} library. #:<< _EOF %define _default_patch_fuzz 2 -%patch 0 -p1 -b .pep517 +#%patch 0 -p1 -b .pep517 %patch 1 -p1 -b .upstream-fix-Protobuf_PROTOC_EXECUTABLE %patch 2 -p1 -b .soversion @@ -76,19 +66,10 @@ This package contains the python bindings to %{protobuf} library. %cmake_build -cd python -LDFLAGS+=" -L${PWD}/../build" \ -PROTOC="${PWD}/../build/protoc" \ -CFLAGS="%{optflags}" \ -%{__python3} -m build --no-isolation --wheel - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %cmake_install -cd python -%{__python3} -m installer --destdir=%{buildroot} dist/*.whl - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -109,7 +90,8 @@ cd python %defattr(-,root,root) %dir %{_includedir}/google/protobuf %{_includedir}/google/protobuf/* -%{_includedir}/java/core/src/main/java/com/google/protobuf/java_features.proto +%{_includedir}/java/core/src/main/resources/google/protobuf/java_features.proto +%{_includedir}/upb_generator/mangle.h %{_includedir}/utf8_range.h %{_includedir}/utf8_validity.h %{_libdir}/libprotobuf*.so @@ -123,15 +105,10 @@ cd python %{_libdir}/pkgconfig/protobuf*.pc %{_libdir}/pkgconfig/utf8_range.pc -%files -n python-%{name}-py3 -%defattr(-,root,root) -%{python3_sitearch}/protobuf-*-py*-nspkg.pth -%dir %{python3_sitearch}/protobuf-*.dist-info -%{python3_sitearch}/protobuf-*.dist-info/* -%dir %{python3_sitearch}/google/protobuf -%{python3_sitearch}/google/protobuf/* - %changelog +* Fri Apr 05 2024 Automatic Build System 26.1-1mamba +- automatic version update by autodist + * Mon Feb 19 2024 Automatic Build System 25.3-1mamba - automatic version update by autodist