From 4531555d3256e2959704bd8779d6a0b6717bbdbe Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Sat, 13 Feb 2021 20:29:27 +0100
Subject: [PATCH] Drop temporary ABI compat

Everything is now correctly rebuilt for the new sonames (including eln).
---
 evolution-data-server.spec | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 5fd0338..1f29d71 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -54,7 +54,7 @@
 
 Name: evolution-data-server
 Version: 3.39.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -91,9 +91,6 @@ BuildRequires: make
 BuildRequires: vala
 BuildRequires: systemd
 
-# for temporary ABI compat
-BuildRequires: evolution-data-server
-
 BuildRequires: pkgconfig(gcr-3)  >= %{gcr_version}
 BuildRequires: pkgconfig(gcr-base-3)  >= %{gcr_version}
 BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
@@ -281,10 +278,6 @@ 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 {} \;
 
@@ -313,11 +306,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_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
-%{_libdir}/libedataserverui-1.2.so.2.0.0
 
 %{_libdir}/girepository-1.0/Camel-1.2.typelib
 %{_libdir}/girepository-1.0/EBackend-1.2.typelib
@@ -490,6 +478,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_datadir}/installed-tests
 
 %changelog
+* Sat Feb 13 2021 Kalev Lember <klember@redhat.com> - 3.39.2-3
+- Drop temporary ABI compat
+
 * Fri Feb 12 2021 Kalev Lember <klember@redhat.com> - 3.39.2-2
 - Keep temporary ABI compat with previous soname