开源软件构建与测试

_service:tar_scm:protobuf.spec Changed

@@ -1,24 +1,24 @@
+#needsrootforbuild
 # Build -python subpackage
 %bcond_without python
 # Build -java subpackage
 %bcond_without java
 
-#global rcver rc2
-
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        3.19.6
+Version:        25.1
 Release:        1
 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
 Source1:        protobuf-init.el
-%global so_version 30
+%global so_version 25.1
 
-Patch9000:      0001-add-secure-compile-option-in-Makefile.patch
-Patch9001:      0002-add-secure-compile-fs-check-in-Makefile.patch
+Patch9000:      0001-add-secure-compile-option.patch
 
-BuildRequires:  make autoconf automake emacs gcc-c++ libtool pkgconfig zlib-devel
+BuildRequires:  cmake gcc-c++ emacs zlib-devel gmock-devel gtest-devel jsoncpp-devel
+BuildRequires:  fdupes pkgconfig python-rpm-macros pkgconfig(zlib) ninja-build
+BuildRequires:  abseil-cpp-devel >= 20230802
 
 %description
 
@@ -31,6 +31,7 @@
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:      protobuf-emacs < %{version}
 Obsoletes:      protobuf-emacs-el < %{version}
+Obsoletes:      protobuf2-compiler
 Requires:       emacs-filesystem >= %{_emacs_version}
 
 %description compiler
@@ -42,10 +43,14 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-compiler = %{version}-%{release}
 Requires:       zlib-devel pkgconfig vim-enhanced
+Requires:       abseil-cpp-devel >= 20230802
 Provides:       %{name}-static
 Provides:       %{name}-vim
 Obsoletes:      %{name}-static < %{version}
 Obsoletes:      %{name}-vim < %{version}
+Obsoletes:      protobuf2-devel
+Obsoletes:      protobuf2-vim
+Obsoletes:      protobuf2-static
 
 
 %description devel
@@ -68,6 +73,8 @@
 Requires:       %{name}-lite = %{version}-%{release}
 Provides:       %{name}-lite-static
 Obsoletes:      %{name}-lite-static <  %{version}
+Obsoletes:      protobuf2-lite-devel
+Obsoletes:      protobuf2-lite-static
 
 %description lite-devel
 This package contains development libraries built with
@@ -99,15 +106,25 @@
 %package java
 Summary:        Java Protocol Buffers runtime library
 BuildArch:      noarch
-BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.code.gson:gson)
-BuildRequires:  mvn(com.google.guava:guava)
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:  mvn(org.easymock:easymock)
+BuildRequires:	java-devel >= 1.6
+BuildRequires:	jpackage-utils
+BuildRequires:	maven-local
+BuildRequires:	mvn(com.google.code.gson:gson)
+BuildRequires:	mvn(com.google.guava:guava)
+BuildRequires:	mvn(junit:junit)
+BuildRequires:	mvn(org.easymock:easymock)
+BuildRequires:	mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:	mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:	mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:	maven-compiler-plugin
+BuildRequires:	maven-install-plugin
+BuildRequires:	maven-jar-plugin
+BuildRequires:	maven-javadoc-plugin
+BuildRequires:	maven-release-plugin
+BuildRequires:	maven-resources-plugin
+BuildRequires:	maven-surefire-plugin
+BuildRequires:	maven-antrun-plugin
 Obsoletes:      %{name}-javanano < 3.6.0
 
 %description java
@@ -165,6 +182,9 @@
 %pom_remove_dep com.google.guava:guava-testlib java/pom.xml java/util/pom.xml
 %pom_remove_dep com.google.j2objc:j2objc-annotations java/util/pom.xml
 
+%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin java/pom.xml java/util/pom.xml
+%pom_remove_dep org.mockito:mockito-core java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
+
 # These use easymockclassextension
 rm java/core/src/test/java/com/google/protobuf/ServiceTest.java
 
@@ -199,21 +219,54 @@
 
 rm -f src/solaris/libstdc++.la
 
+mkdir build
+pushd build
+%cmake \
+	-Dprotobuf_BUILD_EXAMPLES:BOOL=OFF \
+	-Dprotobuf_BUILD_LIBPROTOC:BOOL=ON \
+	-Dprotobuf_BUILD_SHARED_LIBS:BOOL=ON \
+	-Dprotobuf_USE_EXTERNAL_GTEST:BOOL=ON \
+	-Dprotobuf_ABSL_PROVIDER=package \
+	-Dprotobuf_BUILD_TESTS:BOOL=OFF \
+	-DCMAKE_EXE_LINKER_FLAGS=-Wl,--as-needed \
+	-DCMAKE_MODULE_LINKER_FLAGS=-Wl,--as-needed \
+	-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed \
+	-DCMAKE_CXX_FLAGS="-g -O2" \
+	-G Ninja \
+	../
+popd
+
+mkdir build-static
+pushd build-static
+export CMAKE_BUILD_DIR=build-static
+%cmake \
+	-Dprotobuf_BUILD_EXAMPLES:BOOL=OFF \
+	-Dprotobuf_BUILD_LIBPROTOC:BOOL=ON \
+	-Dprotobuf_BUILD_SHARED_LIBS:BOOL=OFF \
+	-Dprotobuf_USE_EXTERNAL_GTEST:BOOL=ON \
+	-Dprotobuf_ABSL_PROVIDER=package \
+	-Dprotobuf_BUILD_TESTS:BOOL=OFF \
+	-G Ninja \
+	../
+popd
+
 %build
-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	
-%make_build CXXFLAGS="%{build_cxxflags} -Wno-error=type-limits"
+%ninja_build -C build
+%ninja_build -C build-static
 
 %if %{with python}
+# Use the just built protoc instead of any
+# system version for python and/or java bindings
+export PROTOC=../build/protoc
 pushd python
+CXXFLAGS="%{build_cxxflags}" \
+LDFLAGS="-L../%{_vpath_builddir} -L../%{_vpath_builddir}/third_party/utf8_range %{build_ldflags}" \
 %py3_build
 popd
 %endif
 
 %if %{with java}
+cp build/protoc ./
 %pom_disable_module kotlin java/pom.xml
 %pom_disable_module kotlin-lite java/pom.xml
 %mvn_build -s -- -Dmaven.test.skip=true -f java/pom.xml
@@ -229,15 +282,16 @@
 %else
 fail=1
 %endif
-%make_build check CXXFLAGS="%{build_cxxflags} -Wno-error=type-limits" || exit $fail
 
 
 %install
-%make_install %{?_smp_mflags} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
-find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
+%ninja_install -C build-static
+%ninja_install -C build
 
 %if %{with python}
 pushd python
+CXXFLAGS="%{build_cxxflags}" \
+LDFLAGS="-L../%{_vpath_builddir} -L../%{_vpath_builddir}/third_party/utf8_range %{build_ldflags}" \
 #python ./setup.py install --root=%{buildroot} --single-version-externally-managed --record=INSTALLED_FILES --optimize=1
 %py3_install
 find %{buildroot}%{python3_sitelib} -name \*.py |
@@ -261,7 +315,7 @@
 %ldconfig_scriptlets compiler
 
 %files
-%doc CHANGES.txt CONTRIBUTORS.txt README.md
+%doc CONTRIBUTORS.txt README.md
 %license LICENSE
 %{_libdir}/libprotobuf.so.%{so_version}{,.*}
 
@@ -273,17 +327,23 @@

_service:tar_scm:0001-add-secure-compile-option-in-Makefile.patch Deleted

_service:tar_scm:0001-add-secure-compile-option.patch Added

_service:tar_scm:0002-add-secure-compile-fs-check-in-Makefile.patch Deleted

_service Changed

_service:tar_scm:protobuf-all-3.19.6.tar.gz -> _service:tar_scm:protobuf-all-25.1.tar.gz Changed

Changes of Revision 3