7 changed files with 188 additions and 82 deletions
--- a/.evolution-mapi.metadata
+++ b/.evolution-mapi.metadata
@ -1 +1 @@
-6445b3dec769be309a03f16b4c6e494e114466ff SOURCES/evolution-mapi-3.28.3.tar.xz
+ec5a9344ecf2e63188bdd6dcb4a37c48e51fab31 evolution-mapi-3.40.1.tar.xz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/evolution-mapi-3.28.3.tar.xz
+/evolution-mapi-*.tar.xz
--- a/SOURCES/evolution-mapi-3.28.3-cmake-variable-name-comparison.patch
+++ b/SOURCES/evolution-mapi-3.28.3-cmake-variable-name-comparison.patch
@ -1,44 +0,0 @@
-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()
--- a/SPECS/evolution-mapi.spec
+++ b/SPECS/evolution-mapi.spec
@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %define openchange_version 2.0
 %define intltool_version 0.35.5

@ -6,21 +8,17 @@
 ### Abstract ###

 Name: evolution-mapi
-Version: 3.28.3
+Version: 3.40.1
 Release: 7%{?dist}
-Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz

 Obsoletes: evolution-mapi-devel <= 3.23.1

 %global eds_evo_version %{version}

-# RH bug #1972749
-Patch01: evolution-mapi-3.28.3-cmake-variable-name-comparison.patch
-
 ### Dependencies ###

 Requires: evolution >= %{eds_evo_version}
@ -33,6 +31,7 @@ BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: intltool >= %{intltool_version}
+BuildRequires: make

 BuildRequires: pkgconfig(camel-1.2) >= %{eds_evo_version}
 BuildRequires: pkgconfig(evolution-data-server-1.2) >= %{eds_evo_version}
@ -42,9 +41,9 @@ BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_evo_version}
 BuildRequires: pkgconfig(libebook-1.2) >= %{eds_evo_version}
-BuildRequires: pkgconfig(libecal-1.2) >= %{eds_evo_version}
+BuildRequires: pkgconfig(libecal-2.0) >= %{eds_evo_version}
 BuildRequires: pkgconfig(libedata-book-1.2) >= %{eds_evo_version}
-BuildRequires: pkgconfig(libedata-cal-1.2) >= %{eds_evo_version}
+BuildRequires: pkgconfig(libedata-cal-2.0) >= %{eds_evo_version}
 BuildRequires: pkgconfig(libemail-engine) >= %{eds_evo_version}
 BuildRequires: pkgconfig(libmapi) >= %{openchange_version}

@ -60,14 +59,9 @@ Requires: %{name} = %{version}-%{release}
 This package contains translations for %{name}.

 %prep
-%setup -q
-%patch01 -p1 -b .cmake-variable-name-comparison
+%autosetup -p1 -S gendiff

 %build
-
-mkdir _build
-cd _build
-
 CFLAGS="$RPM_OPT_FLAGS"

 # Add stricter build settings here as the source code gets cleaned up.
@ -91,15 +85,11 @@ CFLAGS="$CFLAGS \

 export CFLAGS="$CFLAGS -Wno-deprecated-declarations"

-%cmake -G "Unix Makefiles" ..
-
-make %{?_smp_mflags}
+%cmake -G "Unix Makefiles"
+%cmake_build

 %install
-rm -rf $RPM_BUILD_ROOT
-
-cd _build
-make install DESTDIR=$RPM_BUILD_ROOT
+%cmake_install

 %find_lang %{name}

@ -117,29 +107,175 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/metainfo/org.gnome.Evolution-mapi.metainfo.xml
 %{_datadir}/evolution-data-server/mapi

-%files langpacks -f _build/%{name}.lang
+%files langpacks -f %{name}.lang

 %changelog
-* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 3.28.3-7
- Related: #2132051 - Rebuild for samba rebase to 4.17.x
+* Mon Apr 29 2024 Milan Crha <mcrha@redhat.com> - 3.40.1-7
+- Related: RHEL-33645 (Rebuild against samba 4.20)

-* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 3.28.3-6
- Related: #2081620 (Rebuild for samba 4.16 rebase)
+* Wed May 31 2023 Milan Crha <mcrha@redhat.com> - 3.40.1-6
+- Related: #2190415 (Rebuild against samba 4.18)

-* Thu Dec 02 2021 Milan Crha <mcrha@redhat.com> - 3.28.3-5
- Related: #2013596 (Rebuild for samba 4.15 rebase)
+* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 3.40.1-5
+- Related: #2131993 (Rebuild against samba 4.17)

-* Wed Jun 16 2021 Milan Crha <mcrha@redhat.com> - 3.28.3-4
- Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison)
+* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 3.40.1-4
+- Related: #2081618 (Rebuild for samba rebase)

-* Tue Jun 09 2020 Milan Crha <mcrha@redhat.com> - 3.28.3-3
- Rebuild for samba 4.12 rebase
+* Thu Dec 02 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-3
+- Related: #2013578 (Rebuild for samba rebase)

-* Mon Oct 01 2018 Milan Crha <mcrha@redhat.com> - 3.28.3-2
- Add missing Obsoletes for evolution-mapi-devel subpackage (RH bug #1634663)
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.1-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Mon Jun 18 2018 Milan Crha <mcrha@redhat.com> - 3.28.3-1
- Update to 3.28.3
+* Fri Apr 30 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-1
+- Related: #1952776 (Update to 3.40.1)
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Mar 19 2021 Milan Crha <mcrha@redhat.com> - 3.40.0-1
+- Update to 3.40.0
+
+* Fri Mar 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.3-1
+- Update to 3.39.3
+
+* Fri Feb 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.2-1
+- Update to 3.39.2
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 08 2021 Milan Crha <mcrha@redhat.com> - 3.39.1-1
+- Update to 3.39.1
+
+* Fri Sep 11 2020 Milan Crha <mcrha@redhat.com> - 3.38.0-1
+- Update to 3.38.0
+
+* Fri Sep 04 2020 Milan Crha <mcrha@redhat.com> - 3.37.92-1
+- Update to 3.37.92
+
+* Fri Aug 07 2020 Milan Crha <mcrha@redhat.com> - 3.37.90-1
+- Update to 3.37.90
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 03 2020 Milan Crha <mcrha@redhat.com> - 3.37.3-1
+- Update to 3.37.3
+
+* Fri May 29 2020 Milan Crha <mcrha@redhat.com> - 3.37.2-1
+- Update to 3.37.2
+
+* Fri Apr 24 2020 Milan Crha <mcrha@redhat.com> - 3.37.1-1
+- Update to 3.37.1
+
+* Fri Mar 06 2020 Milan Crha <mcrha@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
+* Fri Jan 31 2020 Milan Crha <mcrha@redhat.com> - 3.35.90-1
+- Update to 3.35.90
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 27 2020 Milan Crha <mcrha@redhat.com> - 3.35.3-2
+- Rebuild for new samba
+
+* Fri Jan 03 2020 Milan Crha <mcrha@redhat.com> - 3.35.3-1
+- Update to 3.35.3
+
+* Fri Nov 22 2019 Milan Crha <mcrha@redhat.com> - 3.35.2-1
+- Update to 3.35.2
+
+* Fri Oct 11 2019 Milan Crha <mcrha@redhat.com> - 3.35.1-1
+- Update to 3.35.1
+
+* Mon Oct 07 2019 Milan Crha <mcrha@redhat.com> - 3.34.1-1
+- Update to 3.34.1
+
+* Mon Sep 09 2019 Milan Crha <mcrha@redhat.com> - 3.34.0-1
+- Update to 3.34.0
+
+* Mon Aug 19 2019 Milan Crha <mcrha@redhat.com> - 3.33.91-1
+- Update to 3.33.91
+
+* Mon Aug 05 2019 Milan Crha <mcrha@redhat.com> - 3.33.90-1
+- Update to 3.33.90
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 15 2019 Milan Crha <mcrha@redhat.com> - 3.33.4-1
+- Update to 3.33.4
+
+* Mon Jun 17 2019 Milan Crha <mcrha@redhat.com> - 3.33.3-1
+- Update to 3.33.3
+
+* Mon May 20 2019 Milan Crha <mcrha@redhat.com> - 3.33.2-1
+- Update to 3.33.2
+
+* Mon Apr 22 2019 Milan Crha <mcrha@redhat.com> - 3.33.1-1
+- Update to 3.33.1
+
+* Mon Apr 08 2019 Milan Crha <mcrha@redhat.com> - 3.32.1-1
+- Update to 3.32.1
+
+* Mon Mar 11 2019 Milan Crha <mcrha@redhat.com> - 3.32.0-1
+- Update to 3.32.0
+
+* Mon Feb 18 2019 Milan Crha <mcrha@redhat.com> - 3.31.91-1
+- Update to 3.31.91
+
+* Mon Feb 04 2019 Milan Crha <mcrha@redhat.com> - 3.31.90-1
+- Update to 3.31.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 07 2019 Milan Crha <mcrha@redhat.com> - 3.31.4-1
+- Update to 3.31.4
+
+* Mon Dec 10 2018 Milan Crha <mcrha@redhat.com> - 3.31.3-1
+- Update to 3.31.3
+
+* Mon Nov 12 2018 Milan Crha <mcrha@redhat.com> - 3.31.2-1
+- Update to 3.31.2
+
+* Mon Oct 08 2018 Milan Crha <mcrha@redhat.com> - 3.31.1-1
+- Update to 3.31.1
+- Add missing Obsoletes for evolution-mapi-devel subpackage
+
+* Mon Sep 24 2018 Milan Crha <mcrha@redhat.com> - 3.30.1-1
+- Update to 3.30.1
+
+* Mon Sep 03 2018 Milan Crha <mcrha@redhat.com> - 3.30.0-1
+- Update to 3.30.0
+
+* Mon Aug 27 2018 Milan Crha <mcrha@redhat.com> - 3.29.92-1
+- Update to 3.29.92
+
+* Mon Aug 13 2018 Milan Crha <mcrha@redhat.com> - 3.29.91-1
+- Update to 3.29.91
+
+* Mon Jul 30 2018 Milan Crha <mcrha@redhat.com> - 3.29.90-1
+- Update to 3.29.90
+
+* Mon Jul 16 2018 Milan Crha <mcrha@redhat.com> - 3.29.4-1
+- Update to 3.29.4
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.29.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 18 2018 Milan Crha <mcrha@redhat.com> - 3.29.3-1
+- Update to 3.29.3
+
+* Mon May 21 2018 Milan Crha <mcrha@redhat.com> - 3.29.2-1
+- Update to 3.29.2
+
+* Mon Apr 16 2018 Milan Crha <mcrha@redhat.com> - 3.29.1-1
+- Update to 3.29.1

 * Mon Apr 09 2018 Milan Crha <mcrha@redhat.com> - 3.28.1-1
 - Update to 3.28.1
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,7 @@
+---
+runpath:
+    allowed_paths:
+        - /usr/lib/evolution
+        - /usr/lib/evolution-mapi
+        - /usr/lib64/evolution
+        - /usr/lib64/evolution-mapi
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (evolution-mapi-3.40.1.tar.xz) = b2bed30a530f7a4949ce4411e0cd3bf8ea04ee821abfe47c1d29fb31de1b1b30cc00014a0ec69859d88724f61a8f88ec2699aa5df657f7ca444770d3f5abbd41
				`@ -0,0 +1 @@`
				`SHA512 (evolution-mapi-3.40.1.tar.xz) = b2bed30a530f7a4949ce4411e0cd3bf8ea04ee821abfe47c1d29fb31de1b1b30cc00014a0ec69859d88724f61a8f88ec2699aa5df657f7ca444770d3f5abbd41`