Accepting request 890126 from GNOME:Factory

Scripted push from GNOME:Next (forwarded request 890064 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/890126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-ews?expand=0&rev=113

6d8f7d303e.patch

@@ -1,75 +0,0 @@
-From 6d8f7d303ec319539add2f0ba5331c2dab9d23c7 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 14 Apr 2021 16:58:08 +0200
-Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
-
-CMake 3.20.1 errors out with:
-
-CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
-   variable name cannot be empty
- Call Stack (most recent call first):
-   CMakeLists.txt:152 (add_printable_variable)
-
-Change how the parameter value is compared, to fix it.
----
- cmake/modules/PrintableOptions.cmake | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
-index ba1c9d0b..339f1da4 100644
---- a/cmake/modules/PrintableOptions.cmake
-+++ b/cmake/modules/PrintableOptions.cmake
-@@ -19,40 +19,40 @@
- #    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()
- 
- macro(add_printable_variable_filepath _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "filepath variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
--- 
-GitLab
-

evolution-ews-3.40.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53
-size 666148

evolution-ews-3.40.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a068b16ab019826362c4bd1ef80edfd8935c26c57e1b19a7f308338c996afdcd
+size 672448

evolution-ews.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 30 13:27:57 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 3.40.1:
+  + PrintableOptions.cmake: Correct variable name comparison.
+- Drop 6d8f7d303e.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Fri Apr 30 07:46:05 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

evolution-ews.spec

@@ -20,15 +20,13 @@
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
 
 Name:           evolution-ews
-Version:        3.40.0
+Version:        3.40.1
 Release:        0
 Summary:        Exchange Connector for Evolution, compatible with Exchange 2007 and later
 License:        LGPL-2.1-only
 Group:          Productivity/Networking/Email/Clients
 URL:            https://wiki.gnome.org/Apps/Evolution
 Source0:        https://download.gnome.org/sources/evolution-ews/3.40/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 6d8f7d303e.patch dimstar@opensuse.org -- Fix build with cmake 3.20.1
-Patch0:         https://gitlab.gnome.org/GNOME/evolution-ews/-/commit/6d8f7d303e.patch
 
 BuildRequires:  c++_compiler
 BuildRequires:  cmake