From 5138818ddab79385dcc615be732f8ea996b2ea14 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 12 Feb 2021 18:41:19 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/evolution-data-server.git#907f8b3a78201c1079fdd0fe50c74767b736acb4
---
 evolution-data-server.spec | 30 +++++++++++++++++++++---------
 sources                    |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 7d96561..5fd0338 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -53,8 +53,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.39.1
-Release: 3%{?dist}
+Version: 3.39.2
+Release: 2%{?dist}
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -89,9 +89,10 @@ BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: make
 BuildRequires: vala
-%if ! 0%{?flatpak}
 BuildRequires: systemd
-%endif
+
+# for temporary ABI compat
+BuildRequires: evolution-data-server
 
 BuildRequires: pkgconfig(gcr-3)  >= %{gcr_version}
 BuildRequires: pkgconfig(gcr-base-3)  >= %{gcr_version}
@@ -264,9 +265,7 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d
 	-DENABLE_INTROSPECTION=ON \
 	-DENABLE_VALA_BINDINGS=ON \
 	-DENABLE_INSTALLED_TESTS=ON \
-        %if 0%{?flatpak}
-        -DWITH_SYSTEMDUSERUNITDIR=OFF \
-        %endif
+        -DWITH_SYSTEMDUSERUNITDIR=%{_userunitdir} \
 	%if "%{?_eds_dbus_services_prefix}" != ""
 	-DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \
 	%endif
@@ -282,6 +281,10 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d
 # make sure the directory exists, because it's owned by eds
 mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || :
 
+# for temporary ABI compat
+cp -a %{_libdir}/libedataserver-1.2.so.25* $RPM_BUILD_ROOT%{_libdir}/
+cp -a %{_libdir}/libedataserverui-1.2.so.2* $RPM_BUILD_ROOT%{_libdir}/
+
 # give the libraries some executable bits
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 
@@ -306,6 +309,11 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_libdir}/libedata-book-1.2.so.26.0.0
 %{_libdir}/libedata-cal-2.0.so.1
 %{_libdir}/libedata-cal-2.0.so.1.0.0
+%{_libdir}/libedataserver-1.2.so.26
+%{_libdir}/libedataserver-1.2.so.26.0.0
+%{_libdir}/libedataserverui-1.2.so.3
+%{_libdir}/libedataserverui-1.2.so.3.0.0
+# for temporary ABI compat
 %{_libdir}/libedataserver-1.2.so.25
 %{_libdir}/libedataserver-1.2.so.25.0.0
 %{_libdir}/libedataserverui-1.2.so.2
@@ -356,12 +364,10 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_datadir}/dbus-1/services/%{dbus_service_name_user_prompter}.service
 %{_datadir}/pixmaps/evolution-data-server
 
-%if ! 0%{?flatpak}
 %{_userunitdir}/evolution-addressbook-factory.service
 %{_userunitdir}/evolution-calendar-factory.service
 %{_userunitdir}/evolution-source-registry.service
 %{_userunitdir}/evolution-user-prompter.service
-%endif
 
 %dir %{_libdir}/evolution-data-server
 %dir %{credential_modules_dir}
@@ -484,6 +490,12 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_datadir}/installed-tests
 
 %changelog
+* Fri Feb 12 2021 Kalev Lember <klember@redhat.com> - 3.39.2-2
+- Keep temporary ABI compat with previous soname
+
+* Fri Feb 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.2-1
+- Update to 3.39.2
+
 * Fri Feb 05 2021 Kalev Lember <klember@redhat.com> - 3.39.1-3
 - Recommend pinentry-gui virtual provide, rather than pinentry-gtk
 
diff --git a/sources b/sources
index 0faad66..7d6ddc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-data-server-3.39.1.tar.xz) = de671b8ff5e31867a4923f6ab025792bb03c485c77c17ef480029c8420427eef6df420c78ffc3d5ce2c61d02026d511052d3f71745b55d8bdd8f594419559116
+SHA512 (evolution-data-server-3.39.2.tar.xz) = 9921820c1b1d10ae7d521a837d2419aa272e3a4ce689aa49a5f4aa0f464d3f16e13df0185d57ed85440dc6367ca5c533933f96eb7fe62bc9bebc6ba4a8f97346