diff --git a/protobuf.spec b/protobuf.spec index 500ec5dc0f91ed0d107f74deed506c0e83d37ca6..b95fbe03c040165ab663c396ee278bb3ec9bcdb5 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -8,7 +8,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 3.14.0 -Release: 9 +Release: 10 License: BSD URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz @@ -36,7 +36,8 @@ Summary: Protocol Buffers compiler Requires: %{name} = %{version}-%{release} Obsoletes: protobuf-emacs < %{version} Obsoletes: protobuf-emacs-el < %{version} -Obsoletes: protobuf2-compiler +Conflicts: protobuf2-compiler +Conflicts: protobuf2-emacs Requires: emacs-filesystem >= %{_emacs_version} %description compiler @@ -52,9 +53,9 @@ Provides: %{name}-static Provides: %{name}-vim Obsoletes: %{name}-static < %{version} Obsoletes: %{name}-vim < %{version} -Obsoletes: protobuf2-devel -Obsoletes: protobuf2-vim -Obsoletes: protobuf2-static +Conflicts: protobuf2-devel +Conflicts: protobuf2-vim +Conflicts: protobuf2-static %description devel @@ -77,8 +78,8 @@ Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-lite = %{version}-%{release} Provides: %{name}-lite-static Obsoletes: %{name}-lite-static < %{version} -Obsoletes: protobuf2-lite-devel -Obsoletes: protobuf2-lite-static +Conflicts: protobuf2-lite-devel +Conflicts: protobuf2-lite-static %description lite-devel This package contains development libraries built with @@ -166,7 +167,7 @@ Protocol Buffer BOM POM. %setup -q -n %{name}-%{version}%{?rcver} %autopatch -p1 find -name \*.cc -o -name \*.h | xargs chmod -x -chmod 644 examples/* +find examples -type f | xargs chmod 644 %if %{with java} #%pom_remove_dep com.google.truth:truth java/pom.xml #%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/*/pom.xml @@ -333,6 +334,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Tue Oct 21 2025 Funda Wang - 3.14.0-10 +- bugfix +- ID:NA +- SUG:NA +- DESC: fix build with wrong permission + * Fri June 27 2025 zhongtao - 3.14.0-9 - Type:bugfix - ID:NA