From f78424742f92b0ad9ac0bc69250b73a7ac52a6c0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 10 Oct 2023 17:45:23 +0200 Subject: [PATCH] Resolves: RHEL-12398 (Move WebKitGTK parts in Evolution Data Server into optional subpackage) --- evolution-data-server.spec | 49 +++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index e3feb8f..a983146 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -32,7 +32,7 @@ Name: evolution-data-server Version: 3.28.5 -Release: 21%{?dist} +Release: 22%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -45,6 +45,8 @@ Obsoletes: evolution-webcal < 2.24.0 # RH-bug #1362477 Recommends: pinentry-gtk +Recommends: %{name}-ui + %if 0%{?fedora} # From rhughes-f20-gnome-3-12 copr Obsoletes: compat-evolution-data-server310-libcamel < 3.12 @@ -178,12 +180,26 @@ Requires: pkgconfig(libical) >= %{libical_version} Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version} Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} Requires: pkgconfig(sqlite3) >= %{sqlite_version} -Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version} %description devel Development files needed for building things which link against %{name}. +%package ui +Summary: libedataserverui library from %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description ui +libedataserverui library files from %{name}. + +%package ui-devel +Summary: Development files for building against libedataserverui from %{name} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} + +%description ui-devel +Development files needed for building things which link against libedataserverui from %{name}. + %package langpacks Summary: Translations for %{name} BuildArch: noarch @@ -354,13 +370,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libedata-book-1.2.so.* %{_libdir}/libedata-cal-1.2.so.* %{_libdir}/libedataserver-1.2.so.* -%{_libdir}/libedataserverui-1.2.so.* %{_libdir}/girepository-1.0/Camel-1.2.typelib %{_libdir}/girepository-1.0/EBook-1.2.typelib %{_libdir}/girepository-1.0/EBookContacts-1.2.typelib %{_libdir}/girepository-1.0/EDataServer-1.2.typelib -%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib %{_libexecdir}/camel-gpg-photo-saver %{_libexecdir}/camel-index-control-1.2 @@ -444,12 +458,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{modules_dir}/module-oauth2-services.so %{modules_dir}/module-outlook-backend.so %{modules_dir}/module-secret-monitor.so -%{modules_dir}/module-trust-prompt.so %{modules_dir}/module-webdav-backend.so %{modules_dir}/module-yahoo-backend.so %files devel -%{_includedir}/evolution-data-server +%{_includedir}/evolution-data-server/camel +%{_includedir}/evolution-data-server/libebackend +%{_includedir}/evolution-data-server/libebook +%{_includedir}/evolution-data-server/libebook-contacts +%{_includedir}/evolution-data-server/libecal +%{_includedir}/evolution-data-server/libedata-book +%{_includedir}/evolution-data-server/libedata-cal +%{_includedir}/evolution-data-server/libedataserver %{_libdir}/libcamel-1.2.so %{_libdir}/libebackend-1.2.so %{_libdir}/libebook-1.2.so @@ -458,7 +478,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libedata-book-1.2.so %{_libdir}/libedata-cal-1.2.so %{_libdir}/libedataserver-1.2.so -%{_libdir}/libedataserverui-1.2.so %{_libdir}/pkgconfig/camel-1.2.pc %{_libdir}/pkgconfig/evolution-data-server-1.2.pc %{_libdir}/pkgconfig/libebackend-1.2.pc @@ -468,12 +487,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/pkgconfig/libedata-book-1.2.pc %{_libdir}/pkgconfig/libedata-cal-1.2.pc %{_libdir}/pkgconfig/libedataserver-1.2.pc -%{_libdir}/pkgconfig/libedataserverui-1.2.pc %{_datadir}/gir-1.0/Camel-1.2.gir %{_datadir}/gir-1.0/EBook-1.2.gir %{_datadir}/gir-1.0/EBookContacts-1.2.gir %{_datadir}/gir-1.0/EDataServer-1.2.gir -%{_datadir}/gir-1.0/EDataServerUI-1.2.gir %{_datadir}/vala/vapi/camel-1.2.deps %{_datadir}/vala/vapi/camel-1.2.vapi %{_datadir}/vala/vapi/libebook-1.2.deps @@ -482,6 +499,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/vala/vapi/libebook-contacts-1.2.vapi %{_datadir}/vala/vapi/libedataserver-1.2.deps %{_datadir}/vala/vapi/libedataserver-1.2.vapi + +%files ui +%{_libdir}/libedataserverui-1.2.so.* +%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib +%{modules_dir}/module-trust-prompt.so + +%files ui-devel +%{_includedir}/evolution-data-server/libedataserverui +%{_libdir}/libedataserverui-1.2.so +%{_libdir}/pkgconfig/libedataserverui-1.2.pc +%{_datadir}/gir-1.0/EDataServerUI-1.2.gir %{_datadir}/vala/vapi/libedataserverui-1.2.deps %{_datadir}/vala/vapi/libedataserverui-1.2.vapi @@ -504,6 +532,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/installed-tests %changelog +* Tue Oct 10 2023 Milan Crha - 3.28.5-22 +- Resolves: RHEL-12398 (Move WebKitGTK parts in Evolution Data Server into optional subpackage) + * Tue Sep 05 2023 Milan Crha - 3.28.5-21 - Resolves: RHEL-2219 (Correct BuildRequires for python3)