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

import evolution-3.28.5-18.el8

Browse Source
This commit is contained in:
CentOS Sources 2021-06-24 04:22:02 +00:00 committed by Andrew Lukoshko
parent decf3c54f2
commit ccac59e404
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
SOURCES/evolution-3.28.5-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()

9
SPECS/evolution.spec
View File

@ -31,7 +31,7 @@
Name: evolution Name: evolution
Version: 3.28.5 Version: 3.28.5
Release: 17%{?dist} Release: 18%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -93,6 +93,9 @@ Patch12: evolution-3.28.5-ecalendaritem-settings.patch
# RH bug #1902630 # RH bug #1902630
Patch13: evolution-3.28.5-webkitgtk-2.30.patch Patch13: evolution-3.28.5-webkitgtk-2.30.patch
# RH bug #1972749
Patch14: evolution-3.28.5-cmake-variable-name-comparison.patch
## Dependencies ### ## Dependencies ###
Requires: %{_bindir}/killall Requires: %{_bindir}/killall
@ -276,6 +279,7 @@ the functionality of the installed %{name} package.
%patch11 -p1 -b .webkitgtk-2.28 %patch11 -p1 -b .webkitgtk-2.28
%patch12 -p1 -b .ecalendaritem-settings %patch12 -p1 -b .ecalendaritem-settings
%patch13 -p1 -b .webkitgtk-2.30 %patch13 -p1 -b .webkitgtk-2.30
%patch14 -p1 -b .cmake-variable-name-comparison
# Remove the welcome email from Novell # Remove the welcome email from Novell
for inbox in src/mail/default/*/Inbox; do for inbox in src/mail/default/*/Inbox; do
@ -574,6 +578,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
%endif %endif
%changelog %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 * Mon May 17 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-17
- Resolves: #1961192 (Add missing bundled() Provides for libgnomecanvas) - Resolves: #1961192 (Add missing bundled() Provides for libgnomecanvas)