Accepting request 1225149 from M17N

OBS-URL: https://build.opensuse.org/request/show/1225149
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/googletest?expand=0&rev=21

googletest.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Nov 18 14:31:10 UTC 2024 - Earl Sampson <esampson@suse.com>
+
+- change logic from suse_version > 1500 to suse_version < 1600
+
+-------------------------------------------------------------------
+Fri Sep 27 04:55:15 UTC 2024 - Guang Yee <gyee@suse.com>
+
+- Update C++ complier version so it builds on Leap 15.6.
+
 -------------------------------------------------------------------
 Tue Sep  3 12:52:16 UTC 2024 - pgajdos@suse.com
 

googletest.spec

@@ -33,7 +33,12 @@ URL:            https://github.com/google/googletest
 Source0:        https://github.com/google/googletest/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        googletest-rpmlintrc
 BuildRequires:  cmake >= 3.10.0
-BuildRequires:  gcc-c++ >= 7.3.1
+%if 0%{?suse_version} < 1600
+BuildRequires:  gcc11
+BuildRequires:  gcc11-c++
+%else
+BuildRequires:  gcc-c++
+%endif
 BuildRequires:  pkgconfig
 BuildRequires:  python3
 BuildRequires:  pkgconfig(pthread-stubs)
@@ -84,7 +89,13 @@ with googlemock.
 
 %build
 %global optflags %(echo "%{optflags} -Wno-infinite-recursion -Wno-deprecated-declarations")
-
+%if 0%{?suse_version} < 1600
+export CC=gcc-11
+export CXX=g++-11
+%else
+export CC=gcc-%gcc_version
+export CXX=g++-%gcc_version
+%endif
 %cmake \
   %{?with_tests:-Dgtest_build_tests=ON} \
   %{?with_tests:-Dgmock_build_tests=ON} \