rpms
/
evolution-mapi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import evolution-mapi-3.28.3-4.el8

This commit is contained in:
CentOS Sources 2021-11-09 04:50:04 -05:00 committed by Stepan Oksanichenko
parent dd62aa3bc8
commit f6164a9349
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
SOURCES/evolution-mapi-3.28.3-cmake-variable-name-comparison.patch Normal file
View File

@ -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()

11
SPECS/evolution-mapi.spec
View File

@ -7,7 +7,7 @@
Name: evolution-mapi
Version: 3.28.3
Release: 3%{?dist}
Release: 4%{?dist}
Group: Applications/Productivity
Summary: Evolution extension for MS Exchange 2007 servers
License: LGPLv2+
@ -18,8 +18,8 @@ Obsoletes: evolution-mapi-devel <= 3.23.1
%global eds_evo_version %{version}
# GN-bug #729028
#Patch0: evolution-mapi-3.12.1-openchange-2.1-changes.patch
# RH bug #1972749
Patch01: evolution-mapi-3.28.3-cmake-variable-name-comparison.patch
### Dependencies ###
@ -61,7 +61,7 @@ This package contains translations for %{name}.
%prep
%setup -q
#%patch0 -p1 -b .openchange-2.1-changes
%patch01 -p1 -b .cmake-variable-name-comparison
%build
@ -120,6 +120,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.3-4
- Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison)
* Tue Jun 09 2020 Milan Crha <mcrha@redhat.com> - 3.28.3-3
- Rebuild for samba 4.12 rebase