From e29ccb29c0b17d4c97d55cf3d968bf2a69679e8e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 09 2021 09:51:04 +0000
Subject: import evolution-3.28.5-18.el8


---

diff --git a/SOURCES/evolution-3.28.5-cmake-variable-name-comparison.patch b/SOURCES/evolution-3.28.5-cmake-variable-name-comparison.patch
new file mode 100644
index 0000000..88b9a11
--- /dev/null
+++ b/SOURCES/evolution-3.28.5-cmake-variable-name-comparison.patch
@@ -0,0 +1,44 @@
+diff -up evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake.cmake-variable-name-comparison evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake
+--- evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake.cmake-variable-name-comparison	2021-06-16 16:45:58.554763738 +0200
++++ evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake	2021-06-16 16:47:13.343021509 +0200
+@@ -19,32 +19,32 @@
+ #    prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "option name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	option(${_name} ${_description} ${_default_value})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE STRING ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "path variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE PATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
diff --git a/SPECS/evolution.spec b/SPECS/evolution.spec
index bd7cb10..58c6ca7 100644
--- a/SPECS/evolution.spec
+++ b/SPECS/evolution.spec
@@ -31,13 +31,16 @@
 
 Name: evolution
 Version: 3.28.5
-Release: 16%{?dist}
+Release: 18%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
 Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
 
+# Approximate version number
+Provides: bundled(libgnomecanvas) = 2.30.0
+
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -90,6 +93,9 @@ Patch12: evolution-3.28.5-ecalendaritem-settings.patch
 # RH bug #1902630
 Patch13: evolution-3.28.5-webkitgtk-2.30.patch
 
+# RH bug #1972749
+Patch14: evolution-3.28.5-cmake-variable-name-comparison.patch
+
 ## Dependencies ###
 
 Requires: %{_bindir}/killall
@@ -273,6 +279,7 @@ the functionality of the installed %{name} package.
 %patch11 -p1 -b .webkitgtk-2.28
 %patch12 -p1 -b .ecalendaritem-settings
 %patch13 -p1 -b .webkitgtk-2.30
+%patch14 -p1 -b .cmake-variable-name-comparison
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -571,6 +578,12 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Jun 16 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-18
+- Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison)
+
+* Mon May 17 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-17
+- Resolves: #1961192 (Add missing bundled() Provides for libgnomecanvas)
+
 * Mon Nov 30 2020 Milan Crha <mcrha@redhat.com> - 3.28.5-16
 - Resolves: #1902630 (Crash on file drag into mail composer with WebKitGTK 2.30)