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#ef060ce917e3c7277556d7b6adc1376b29191834
This commit is contained in:
DistroBaker 2021-02-13 19:50:28 +00:00
parent 5138818dda
commit d56ec08ee0

View File

@ -54,7 +54,7 @@
Name: evolution-data-server Name: evolution-data-server
Version: 3.39.2 Version: 3.39.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
License: LGPLv2+ License: LGPLv2+
URL: https://wiki.gnome.org/Apps/Evolution URL: https://wiki.gnome.org/Apps/Evolution
@ -91,9 +91,6 @@ BuildRequires: make
BuildRequires: vala BuildRequires: vala
BuildRequires: systemd BuildRequires: systemd
# for temporary ABI compat
BuildRequires: evolution-data-server
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version} BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
BuildRequires: pkgconfig(gcr-base-3) >= %{gcr_version} BuildRequires: pkgconfig(gcr-base-3) >= %{gcr_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_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 # make sure the directory exists, because it's owned by eds
mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || : 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 # give the libraries some executable bits
find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; 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}/libedataserver-1.2.so.26.0.0
%{_libdir}/libedataserverui-1.2.so.3 %{_libdir}/libedataserverui-1.2.so.3
%{_libdir}/libedataserverui-1.2.so.3.0.0 %{_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/Camel-1.2.typelib
%{_libdir}/girepository-1.0/EBackend-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 %{_datadir}/installed-tests
%changelog %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 * Fri Feb 12 2021 Kalev Lember <klember@redhat.com> - 3.39.2-2
- Keep temporary ABI compat with previous soname - Keep temporary ABI compat with previous soname