[packages/gtest] - updated to 1.12.1; gtest-config and gmock generator are gone
qboosh
qboosh at pld-linux.org
Tue Jan 17 06:10:51 CET 2023
commit 471f59445416044e337bc4d9c91b1cd6e413aac7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jan 17 06:11:59 2023 +0100
- updated to 1.12.1; gtest-config and gmock generator are gone
cmake.patch | 28 ++++++++++++++--------------
gtest.spec | 32 ++++----------------------------
2 files changed, 18 insertions(+), 42 deletions(-)
---
diff --git a/gtest.spec b/gtest.spec
index 4de5adb..2645a65 100644
--- a/gtest.spec
+++ b/gtest.spec
@@ -6,16 +6,16 @@
Summary: Google C++ testing framework
Summary(pl.UTF-8): Szkielet testów w C++ stworzony przez Google
Name: gtest
-Version: 1.11.0
-Release: 3
+Version: 1.12.1
+Release: 1
License: BSD
Group: Development/Tools
#Source0Download: https://github.com/google/googletest/releases
Source0: https://github.com/google/googletest/archive/release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: e8a8df240b6938bb6384155d4c37d937
+# Source0-md5: e82199374acdfda3f425331028eb4e2a
Patch0: cmake.patch
URL: https://github.com/google/googletest
-BuildRequires: cmake >= 2.8.8
+BuildRequires: cmake >= 3.5
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: python >= 2.3
BuildRequires: python-modules >= 2.3
@@ -151,8 +151,6 @@ Kod źródłowy szkieletu gmock do osadzania go w innych projektach.
%setup -q -n googletest-release-%{version}
%patch0 -p1
-grep -rl 'bin/env python' googlemock/scripts | xargs %{__sed} -i -e '1s,^#!.*python,#!%{__python},'
-
%build
# Note: official build system is now Bazel - but it's extremely distro unfriendly.
# Use unofficial, community maintained CMake suite.
@@ -182,27 +180,11 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-%{__sed} -e 's, at PACKAGE_TARNAME@,gtest,' \
- -e 's, at PACKAGE_VERSION@,%{version},' \
- -e 's, at prefix@,%{_prefix},' \
- -e 's, at exec_prefix@,%{_exec_prefix},' \
- -e 's, at bindir@,%{_bindir},' \
- -e 's, at libdir@,%{_libdir},' \
- -e 's, at includedir@,%{_includedir},' \
- -e 's, at top_srcdir@,%{_prefix}/src/gtest,' \
- -e 's, at PTHREAD_CFLAGS@,-pthread,' \
- -e 's, at PTHREAD_LIBS@,-lpthread,' \
- googletest/scripts/gtest-config.in > $RPM_BUILD_ROOT%{_bindir}/gtest-config
-
install -d $RPM_BUILD_ROOT%{_prefix}/src/gtest
cp -pr googletest/{cmake,src,CMakeLists.txt} $RPM_BUILD_ROOT%{_prefix}/src/gtest
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -p googletest/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install -d $RPM_BUILD_ROOT%{_datadir}/gmock/generator
-cp -pr googlemock/scripts/generator/{cpp,gmock_gen.py} $RPM_BUILD_ROOT%{_datadir}/gmock/generator
-
install -d $RPM_BUILD_ROOT%{_prefix}/src/gmock
cp -pr googlemock/{cmake,src,CMakeLists.txt} $RPM_BUILD_ROOT%{_prefix}/src/gmock
# gmock CMakeLists.txt expects gtest or ../googletest accessile
@@ -222,7 +204,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gtest-config
%attr(755,root,root) %{_libdir}/libgtest.so
%attr(755,root,root) %{_libdir}/libgtest_main.so
%{_includedir}/gtest
@@ -255,11 +236,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/gmock
%{_pkgconfigdir}/gmock.pc
%{_pkgconfigdir}/gmock_main.pc
-%dir %{_datadir}/gmock
-%dir %{_datadir}/gmock/generator
-%attr(755,root,root) %{_datadir}/gmock/generator/gmock_gen.py
-%dir %{_datadir}/gmock/generator/cpp
-%attr(755,root,root) %{_datadir}/gmock/generator/cpp/*.py
%if %{with static_libs}
%files -n gmock-static
diff --git a/cmake.patch b/cmake.patch
index fa6d6df..d9d0fe3 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,28 +1,28 @@
---- googletest-release-1.11.0/googletest/CMakeLists.txt~ 2021-06-11 19:42:26.000000000 +0200
-+++ googletest-release-1.11.0/googletest/CMakeLists.txt 2022-02-14 22:01:48.393482954 +0100
-@@ -138,10 +138,10 @@
- if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+--- googletest-release-1.12.1/googletest/CMakeLists.txt.orig 2023-01-16 21:26:08.891283192 +0100
++++ googletest-release-1.12.1/googletest/CMakeLists.txt 2023-01-16 21:27:14.834259281 +0100
+@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMA
+ string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
target_include_directories(gtest SYSTEM INTERFACE
- "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
+ "$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gtest_main SYSTEM INTERFACE
- "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
+ "$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
endif()
- target_link_libraries(gtest_main PUBLIC gtest)
-
---- googletest-release-1.11.0/googlemock/CMakeLists.txt~ 2021-06-11 19:42:26.000000000 +0200
-+++ googletest-release-1.11.0/googlemock/CMakeLists.txt 2022-02-14 22:02:08.163879047 +0100
-@@ -111,10 +111,10 @@
- if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+ if(CMAKE_SYSTEM_NAME MATCHES "QNX")
+ target_link_libraries(gtest PUBLIC regex)
+--- googletest-release-1.12.1/googlemock/CMakeLists.txt.orig 2023-01-16 21:26:08.891283192 +0100
++++ googletest-release-1.12.1/googlemock/CMakeLists.txt 2023-01-16 21:27:34.230820868 +0100
+@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMA
+ string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
target_include_directories(gmock SYSTEM INTERFACE
- "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
+ "$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gmock_main SYSTEM INTERFACE
- "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
+ "$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtest.git/commitdiff/471f59445416044e337bc4d9c91b1cd6e413aac7
More information about the pld-cvs-commit
mailing list