From 225aa4c0f8256e39bbc04cb518c682fb7ca15e9f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 24 2021 04:22:34 +0000
Subject: import evolution-ews-3.28.5-11.el8


---

diff --git a/SOURCES/evolution-ews-3.28.5-cmake-variable-name-comparison.patch b/SOURCES/evolution-ews-3.28.5-cmake-variable-name-comparison.patch
new file mode 100644
index 0000000..88b9a11
--- /dev/null
+++ b/SOURCES/evolution-ews-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-ews.spec b/SPECS/evolution-ews.spec
index e0873fb..0855364 100644
--- a/SPECS/evolution-ews.spec
+++ b/SPECS/evolution-ews.spec
@@ -2,7 +2,7 @@
 
 Name: evolution-ews
 Version: 3.28.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for Exchange Web Services
 License: LGPLv2
@@ -46,6 +46,9 @@ Patch11: evolution-ews-3.28.5-oauth2-simplify.patch
 # RH bug #1885229
 Patch12: evolution-ews-3.28.5-oauth2-endpoints.patch
 
+# RH bug #1972749
+Patch13: evolution-ews-3.28.5-cmake-variable-name-comparison.patch
+
 Requires: evolution >= %{eds_evo_version}
 Requires: evolution-data-server >= %{eds_evo_version}
 Requires: %{name}-langpacks = %{version}-%{release}
@@ -97,6 +100,7 @@ This package contains translations for %{name}.
 %patch10 -p1 -b .save-only-if-organizer
 %patch11 -p1 -b .oauth2-simplify
 %patch12 -p1 -b .oauth2-endpoints
+%patch13 -p1 -b .cmake-variable-name-comparison
 
 %build
 
@@ -137,6 +141,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files langpacks -f _build/%{name}.lang
 
 %changelog
+* Wed Jun 16 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-11
+- Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison)
+
 * Wed Oct 07 2020 Milan Crha <mcrha@redhat.com> - 3.28.5-10
 - Resolves: #1886026 (Simplify OAuth2 for outlook.office365.com server)
 - Resolves: #1885229 (Allow change of the Microsoft 365 OAuth2 endpoints)