Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-calendar for openSUSE:Factory
checked in at 2024-03-29 13:09:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-calendar (Old)
and /work/SRC/openSUSE:Factory/.deepin-calendar.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-calendar"
Fri Mar 29 13:09:48 2024 rev:8 rq:1163336 version:5.8.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-calendar/deepin-calendar.changes
2022-09-01 22:10:50.580190323 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-calendar.new.1905/deepin-calendar.changes
2024-03-29 13:10:36.670366165 +0100
@@ -1,0 +2,5 @@
+Thu Mar 28 13:55:29 UTC 2024 - Hillwood Yang <[email protected]>
+
+- Fix build on gtest 1.14.0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-calendar.spec ++++++
--- /var/tmp/diff_new_pack.g9GfOg/_old 2024-03-29 13:10:37.130383073 +0100
+++ /var/tmp/diff_new_pack.g9GfOg/_new 2024-03-29 13:10:37.134383220 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deepin-calendar
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
%define _name dde-calendar
-
+%define gtest_version %(rpm -q --queryformat '%%{VERSION}' gtest)
%if 0%{?is_opensuse}
%define distribution openSUSE-Edition
%else
@@ -93,10 +93,13 @@
sed -i 's/Exec=dde-calendar/Exec=env QT_QPA_PLATFORMTHEME=deepin
dde-calendar/g' \
calendar-client/assets/dde-calendar.desktop
sed -i 's/5.5//g' calendar-client/CMakeLists.txt
calendar-service/CMakeLists.txt
+%if "%{gtest_version}" >= "1.14.0"
+sed -i '/CMAKE_CXX_STANDARD/s|11|14|g' tests/*/CMakeLists.txt
+%endif
%build
%cmake -DVERSION=%{version}-%{distribution}
-%make_build
+%cmake_build
%install
%cmake_install