From fe9f3e287045fa66f5534c73cecb30c45935e03d Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: May 21 2018 10:19:47 +0000
Subject: Update to 3.29.2


---

diff --git a/.gitignore b/.gitignore
index 2b5efc5..952457f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-3.28.0.tar.xz
 /evolution-data-server-3.28.1.tar.xz
 /evolution-data-server-3.29.1.tar.xz
+/evolution-data-server-3.29.2.tar.xz
diff --git a/evolution-data-server-3.29.1-icu61_1.patch b/evolution-data-server-3.29.1-icu61_1.patch
deleted file mode 100644
index cf9b043..0000000
--- a/evolution-data-server-3.29.1-icu61_1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4d53769b4b4c2753f4e7d0a956c6876d6792129a Mon Sep 17 00:00:00 2001
-From: Hussam Al-Tayeb <me@hussam.eu.org>
-Date: Mon, 16 Apr 2018 13:38:33 +0200
-Subject: Bug 795295 - Fails to compile after icu 61.1 upgrade
- (icu::UnicodeString)
-
-
-diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
-index d3e44f488..a789f4409 100644
---- a/src/libedataserver/e-alphabet-index-private.cpp
-+++ b/src/libedataserver/e-alphabet-index-private.cpp
-@@ -36,6 +36,7 @@
- 
- using icu::AlphabeticIndex;
- using icu::Locale;
-+using icu::UnicodeString;
- 
- struct _EAlphabetIndex {
- 	AlphabeticIndex *priv;
-diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
-index bb15593d5..6f1d89c8d 100644
---- a/src/libedataserver/e-transliterator-private.cpp
-+++ b/src/libedataserver/e-transliterator-private.cpp
-@@ -35,6 +35,7 @@
- #include <unicode/translit.h>
- 
- using icu::Transliterator;
-+using icu::UnicodeString;
- 
- struct _ETransliterator {
- 	Transliterator *priv;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index cc02b2d..0468b36 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,18 +27,21 @@
 %define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
 %define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
 %define modules_dir %{_libdir}/evolution-data-server/registry-modules
+%define uimodules_dir %{_libdir}/evolution-data-server/ui-modules
 
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.29.1
-Release: 2%{?dist}
+Version: 3.29.2
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
 Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz
 
+### Patches ###
+
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
 
@@ -50,10 +53,6 @@ Recommends: pinentry-gtk
 Obsoletes: compat-evolution-data-server310-libcamel < 3.12
 %endif
 
-### Patches ###
-
-Patch01: evolution-data-server-3.29.1-icu61_1.patch
-
 ### Dependencies ###
 
 Requires: dconf
@@ -94,6 +93,7 @@ BuildRequires: pkgconfig(nss) >= %{nss_version}
 BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
 BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
 BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
+BuildRequires: pkgconfig(libcanberra-gtk3)
 
 %if %{ldap_support}
 BuildRequires: openldap-devel >= 2.0.11
@@ -171,7 +171,6 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q
-%patch01 -p1 -b .icu61_1
 
 %build
 
@@ -256,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# make sure the directory exists, because it's owned by eds
+mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || :
+
 # give the libraries some executable bits
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 
@@ -304,8 +306,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %dir %{_libexecdir}/evolution-data-server
 %{_libexecdir}/evolution-data-server/addressbook-export
+%{_libexecdir}/evolution-data-server/evolution-alarm-notify
 %{_libexecdir}/evolution-data-server/list-sources
 
+%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
+
 # GSettings schemas:
 %{_datadir}/GConf/gsettings/evolution-data-server.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
@@ -333,6 +338,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %dir %{ebook_backends_dir}
 %dir %{ecal_backends_dir}
 %dir %{modules_dir}
+%dir %{uimodules_dir}
 
 %{_libdir}/evolution-data-server/libedbus-private.so
 
@@ -433,6 +439,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon May 21 2018 Milan Crha <mcrha@redhat.com> - 3.29.2-1
+- Update to 3.29.2
+
 * Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 3.29.1-2
 - Rebuild for ICU 61.1
 
diff --git a/sources b/sources
index 17cf539..f4260ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-data-server-3.29.1.tar.xz) = 1ef49a26e54249055c0ecf36504565bec2a77c292bd2de0bad37b9a5f851e6cd01303229275524cc67db50b06843c14d1fa27801ea24a621c9fbf0e309c5c51b
+SHA512 (evolution-data-server-3.29.2.tar.xz) = 74af0f063d6387609ebfb69a0d34749493d03d8dfae6035150861a0c001531d21394fd53664b95a19ee5e6bc0d367f4256e6c3821000e38e7e5e8079a1766b2e