From 6078b8356ef4971bff9bc790fa4d62db375839ad Mon Sep 17 00:00:00 2001
From: Zhao Hang <wb-zh951434@alibaba-inc.com>
Date: Mon, 20 May 2024 10:37:11 +0800
Subject: [PATCH 1/2] update to evolution-3.40.4-10.src.rpm

Signed-off-by: Zhao Hang <wb-zh951434@alibaba-inc.com>
---
 evolution.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index d7576bb..c09deae 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 3.40.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -81,6 +81,7 @@ Requires: %{_bindir}/killall
 Requires: gvfs
 %endif
 Requires: evolution-data-server >= %{eds_version}
+Requires: evolution-data-server-ui >= %{eds_version}
 Requires: gspell
 Requires: highlight
 Requires: %{name}-langpacks = %{version}-%{release}
@@ -574,6 +575,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-10
+- Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)
+- Add dependency on newly introduced evolution-data-server-ui
+
 * Tue Jan 03 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-9
 - Resolves: #2126524 (Update patch to handle frame flattening change in WebKitGTK)
 
-- 
Gitee


From d05f846388d42e4e5f34f8b497c1b98e61fe8861 Mon Sep 17 00:00:00 2001
From: mgb01105731 <mgb01105731@alibaba-inc.com>
Date: Sat, 16 Jul 2022 15:14:58 +0800
Subject: [PATCH 2/2] Add doc sub package

---
 evolution.spec | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index c09deae..f7c6fdf 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,3 +1,4 @@
+%define anolis_release .0.1
 %undefine __cmake_in_source_build
 
 %global _changelog_trimtime %(date +%s -d "1 year ago")
@@ -43,7 +44,7 @@
 
 Name: evolution
 Version: 3.40.4
-Release: 10%{?dist}
+Release: 10%{anolis_release}%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -152,12 +153,24 @@ BuildRequires: pkgconfig(libnotify)
 BuildRequires: pkgconfig(libpst)
 %endif
 
+Requires:      glibc
+Provides:      /usr/bin/evolution
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool.  The components which make up Evolution
 are tightly integrated with one another and act as a seamless
 personal information-management tool.
 
+%package doc
+Summary: Documents for %{name}
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+
+%description  doc
+Doc pages for %{name}.
+
 %package devel
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
@@ -351,7 +364,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 %files
 %license COPYING
-%doc AUTHORS NEWS README.md
 %{_mandir}/man1/*
 
 # GSettings schemas:
@@ -402,7 +414,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 # The main data directory
 # (have not attempted to split this up into an explicit list)
 %dir %{_datadir}/evolution
-%{_datadir}/evolution
+%{_datadir}/evolution/*
 
 # Modules:
 %dir %{_libdir}/evolution
@@ -528,6 +540,8 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{evo_plugin_dir}/org-gnome-dbx-import.eplug
 %{evo_plugin_dir}/liborg-gnome-dbx-import.so
 
+%files doc
+%doc AUTHORS NEWS README.md
 
 %files devel
 %{_includedir}/evolution
@@ -575,6 +589,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon May 20 2024 mgb01105731 <mgb01105731@alibaba-inc.com> - 3.40.4-10.0.1
+- Add doc sub package
+
 * Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-10
 - Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)
 - Add dependency on newly introduced evolution-data-server-ui
-- 
Gitee