diff --git a/baselibs.conf b/baselibs.conf index d5c12f1..b86bc3f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf25_1_0 -libprotoc25_1_0 -libprotobuf-lite25_1_0 +libprotobuf25_2_0 +libprotoc25_2_0 +libprotobuf-lite25_2_0 diff --git a/protobuf-25.1.tar.gz b/protobuf-25.1.tar.gz deleted file mode 100644 index 3a4f56c..0000000 --- a/protobuf-25.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42 -size 5878124 diff --git a/protobuf-25.2.tar.gz b/protobuf-25.2.tar.gz new file mode 100644 index 0000000..41c732e --- /dev/null +++ b/protobuf-25.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871 +size 5878387 diff --git a/protobuf-rpmlintrc b/protobuf-rpmlintrc deleted file mode 100644 index f8008a5..0000000 --- a/protobuf-rpmlintrc +++ /dev/null @@ -1,3 +0,0 @@ -addFilter("shlib-policy-name-error") -addFilter("env-script-interpreter") -addFilter("spurious-executable-perm") diff --git a/protobuf.changes b/protobuf.changes index 32b50ec..2886932 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 8 16:25:26 UTC 2024 - Andreas Stieger + +- update to 25.2: + * Only substitute prefixes during installation setup + * Register a shutdown delete for C++ feature defaults + ------------------------------------------------------------------- Tue Jan 2 13:52:00 UTC 2024 - Dirk Müller diff --git a/protobuf.spec b/protobuf.spec index b17f20e..2006e9b 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -16,8 +16,6 @@ # -%{!?make_build:%global make_build make %{?_smp_mflags}} -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define tarname protobuf %define extra_java_flags -source 8 -target 8 # requires gmock, which is not yet in the distribution @@ -26,8 +24,8 @@ %bcond_without python3 %{?sle15_python_module_pythons} Name: protobuf -Version: 25.1 -%global sover 25_1_0 +Version: 25.2 +%global sover 25_2_0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause @@ -36,7 +34,6 @@ URL: https://github.com/protocolbuffers/protobuf Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz Source1: manifest.txt.in Source2: baselibs.conf -Source1000: %{name}-rpmlintrc Patch0: add-missing-stdint-header.patch BuildRequires: %{python_module abseil} BuildRequires: %{python_module devel >= 3.7} @@ -215,24 +212,24 @@ popd %fdupes %{buildroot}%{_prefix} -%post -n libprotobuf%{sover} -p /sbin/ldconfig -%postun -n libprotobuf%{sover} -p /sbin/ldconfig -%post -n libprotoc%{sover} -p /sbin/ldconfig -%postun -n libprotoc%{sover} -p /sbin/ldconfig -%post -n libprotobuf-lite%{sover} -p /sbin/ldconfig -%postun -n libprotobuf-lite%{sover} -p /sbin/ldconfig +%ldconfig_scriptlets -n libprotobuf%{sover} +%ldconfig_scriptlets -n libprotoc%{sover} +%ldconfig_scriptlets -n libprotobuf-lite%{sover} %files -n libprotobuf%{sover} %license LICENSE %{_libdir}/libprotobuf.so.%{VERSION}.0 %files -n libprotoc%{sover} +%license LICENSE %{_libdir}/libprotoc.so.%{VERSION}.0 %files -n libprotobuf-lite%{sover} +%license LICENSE %{_libdir}/libprotobuf-lite.so.%{VERSION}.0 %files devel +%license LICENSE %doc CONTRIBUTORS.txt README.md %{_bindir}/protoc* %{_includedir}/google @@ -258,6 +255,7 @@ popd %if %{with java} %files -n %{name}-java -f java/.mfiles +%license LICENSE %{_javadir}/%{name}.jar %endif