X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=evolution-data-server.spec;h=4c61dabba2fc9cea3920f15bd1aaf26c3cc3b345;hb=HEAD;hp=2d00ae2274ba71a97882fe72cfb73f7907bb2950;hpb=6a3e677f0de0fbd3675b67175b228db844bc5d60;p=packages%2Fevolution-data-server.git

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 2d00ae2..4bff646 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,39 +1,38 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# API documentation
-%bcond_with	gweather4	# libgweather4 instead of libgweather 3
 %bcond_without	kerberos5	# Kerberos5 support
 %bcond_without	ldap		# LDAP support
 %bcond_without	goa		# Gnome Online Accounts support
 %bcond_without	phonenumber	# libphonenumber support for address books
 %bcond_without	vala		# Vala API
 
-%define		basever		3.42
 %define		apiver		1.2
 %define		cal_apiver	2.0
+%define		ui4_apiver	1.0
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	3.44.2
+Version:	3.52.2
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	https://download.gnome.org/sources/evolution-data-server/3.44/%{name}-%{version}.tar.xz
-# Source0-md5:	131caff71f487d402b7bf62e9a7a2e37
+Source0:	https://download.gnome.org/sources/evolution-data-server/3.52/%{name}-%{version}.tar.xz
+# Source0-md5:	35ab9c0ee5bca3ebac74828341308503
 Patch0:		%{name}-gtkdoc.patch
-URL:		https://wiki.gnome.org/Apps/Evolution
-BuildRequires:	cmake >= 3.1
+URL:		https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
+BuildRequires:	cmake >= 3.15
 BuildRequires:	db-devel
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gcr-devel >= 3.4.0
-BuildRequires:	gcr-ui-devel >= 3.4.0
 BuildRequires:	gettext-tools >= 0.18.1
-BuildRequires:	glib2-devel >= 1:2.46.0
+BuildRequires:	glib2-devel >= 1:2.68
 %{?with_goa:BuildRequires:	gnome-online-accounts-devel >= 3.8.0}
 BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gperf
-BuildRequires:	gtk+3-devel >= 3.16
-BuildRequires:	gtk-webkit4-devel >= 2.28.0
+BuildRequires:	gtk+3-devel >= 3.20
+BuildRequires:	gtk4-devel >= 4.4
+BuildRequires:	gtk-webkit4.1-devel >= 2.34.0
+BuildRequires:	gtk-webkit6-devel >= 2.40.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	intltool >= 0.40.0
@@ -41,13 +40,13 @@ BuildRequires:	json-glib-devel >= 1.0.4
 BuildRequires:	libcanberra-gtk3-devel >= 0.25
 %{?with_kerberos5:BuildRequires:	libcom_err-devel}
 BuildRequires:	libgdata-devel >= 0.15.1
-%{!?with_gweather4:BuildRequires:	libgweather-devel >= 3.10}
-%{?with_gweather4:BuildRequires:	libgweather4-devel >= 4}
+# libgweather4 built with libsoup3
+BuildRequires:	libgweather4-devel >= 4
 BuildRequires:	libical-glib-devel >= 3.0.7
 BuildRequires:	libicu-devel
 %{?with_phonenumber:BuildRequires:	libphonenumber-devel}
 BuildRequires:	libsecret-devel >= 0.5
-BuildRequires:	libsoup-devel >= 2.58
+BuildRequires:	libsoup3-devel >= 3.1.1
 BuildRequires:	libstdc++-devel >= 6:5.0
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.31
@@ -65,12 +64,14 @@ BuildRequires:	vala-libgdata >= 0.15.1
 %{?with_goa:BuildRequires:	vala-gnome-online-accounts >= 3.8.0}
 BuildRequires:	xz
 BuildRequires:	zlib-devel
-Requires(post,postun):	glib2 >= 1:2.46.0
+Requires(post,postun):	glib2 >= 1:2.68
+Requires:	%{name}-gtk3-libs = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_goa:Requires:	gnome-online-accounts-libs >= 3.8.0}
-Requires:	gtk+3 >= 3.16
+Requires:	gtk+3 >= 3.20
+Requires:	gtk4 >= 4.4
 Requires:	libgdata >= 0.15.1
-%{!?with_gweather4:Requires:	libgweather >= 3.10}
+Requires:	libgweather4 >= 4
 Obsoletes:	evolution-data-server-uoa < 3.32
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -113,14 +114,13 @@ Ten pakiet zawiera evolutionperson.schema dla serwera OpenLDAP.
 Summary:	Evolution Data Server library
 Summary(pl.UTF-8):	Biblioteka Evolution Data Server
 Group:		X11/Libraries
-Requires:	gcr-libs >= 3.4.0
-Requires:	gcr-ui >= 3.4.0
-Requires:	glib2 >= 1:2.46.0
-Requires:	gtk-webkit4 >= 2.28.0
+Requires:	glib2 >= 1:2.68
+Requires:	gtk4 >= 4.4
+Requires:	gtk-webkit6 >= 2.40.0
 Requires:	json-glib >= 1.0.4
 Requires:	libical-glib >= 3.0.7
 Requires:	libsecret >= 0.5
-Requires:	libsoup >= 2.58
+Requires:	libsoup3 >= 3.1.1
 Requires:	libxml2 >= 1:2.6.31
 Requires:	sqlite3 >= 3.7.17
 Obsoletes:	evolution-data-server-static < 3.24
@@ -136,14 +136,13 @@ Summary:	Evolution data server development files
 Summary(pl.UTF-8):	Pliki programistyczne serwera danych evolution
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gcr-devel >= 3.4.0
-Requires:	gcr-ui-devel >= 3.4.0
-Requires:	glib2-devel >= 1:2.46.0
+Requires:	glib2-devel >= 1:2.68
+Requires:	gtk4-devel >= 4.4
 %{?with_kerberos5:Requires:	heimdal-devel}
 Requires:	libgdata-devel >= 0.15.1
 Requires:	libical-glib-devel >= 3.0.7
 Requires:	libsecret-devel >= 0.5
-Requires:	libsoup-devel >= 2.58
+Requires:	libsoup3-devel >= 3.1.1
 Requires:	libxml2-devel >= 1:2.6.31
 Requires:	nspr-devel >= 4
 Requires:	nss-devel >= 3
@@ -157,18 +156,6 @@ using Evolution's data server libraries.
 Ten pakiet zawiera pliki potrzebne do tworzenia aplikacji
 korzystających z bibliotek serwera danych Evolution.
 
-%package static
-Summary:	Evolution data server static libraries
-Summary(pl.UTF-8):	Statyczne biblioteki serwera danych Evolution
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Evolution data server static libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki serwera danych Evolution.
-
 %package apidocs
 Summary:	Evolution data server API documentation
 Summary(pl.UTF-8):	Dokumentacja API serwera danych Evolution
@@ -196,14 +183,100 @@ Evolution data server API for Vala language.
 %description -n vala-evolution-data-server -l pl.UTF-8
 API serwera danych Evolution dla języka Vala.
 
+%package gtk3-libs
+Summary:	Evolution data server GTK+ 3 UI library
+Summary(pl.UTF-8):	Biblioteka interfejsu użytkownika GTK+ 3 serwera danych Evolution
+Group:		X11/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk+3 >= 3.20
+Requires:	gtk-webkit4.1 >= 2.34.0
+
+%description gtk3-libs
+Evolution data server GTK+ 3 UI library.
+
+%description gtk3-libs -l pl.UTF-8
+Biblioteka interfejsu użytkownika GTK+ 3 serwera danych Evolution.
+
+%package gtk3-devel
+Summary:	Header files for Evolution data server GTK+ 3 UI library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki interfejsu użytkownika GTK+ 3 serwera danych Evolution
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-gtk3-libs = %{version}-%{release}
+Requires:	gtk+3-devel >= 3.20
+
+%description gtk3-devel
+Header files for Evolution data server GTK+ 3 UI library.
+
+%description gtk3-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki interfejsu użytkownika GTK+ 3 serwera
+danych Evolution.
+
+%package -n vala-evolution-data-server-gtk3
+Summary:	Vala API for Evolution data server GTK+ 3 UI library
+Summary(pl.UTF-8):	API języka Vala do biblioteki interfejsu użytkownika GTK+ 3 serwera danych Evolution
+Group:		X11/Development/Libraries
+Requires:	%{name}-gtk3-devel = %{version}-%{release}
+Requires:	vala-evolution-data-server = %{version}-%{release}
+BuildArch:	noarch
+
+%description -n vala-evolution-data-server-gtk3
+Vala API for Evolution data server GTK+ 3 UI library.
+
+%description -n vala-evolution-data-server-gtk3 -l pl.UTF-8
+API języka Vala do biblioteki interfejsu użytkownika GTK+ 3 serwera
+danych Evolution.
+
+%package gtk4-libs
+Summary:	Evolution data server GTK 4 UI library
+Summary(pl.UTF-8):	Biblioteka interfejsu użytkownika GTK 4 serwera danych Evolution
+Group:		X11/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk4 >= 4.4
+Requires:	gtk-webkit6 >= 2.40.0
+
+%description gtk4-libs
+Evolution data server GTK 4 UI library.
+
+%description gtk4-libs -l pl.UTF-8
+Biblioteka interfejsu użytkownika GTK 4 serwera danych Evolution.
+
+%package gtk4-devel
+Summary:	Header files for Evolution data server GTK 4 UI library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki interfejsu użytkownika GTK 4 serwera danych Evolution
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-gtk4-libs = %{version}-%{release}
+Requires:	gtk4-devel >= 4.4
+
+%description gtk4-devel
+Header files for Evolution data server GTK 4 UI library.
+
+%description gtk4-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki interfejsu użytkownika GTK 4 serwera
+danych Evolution.
+
+%package -n vala-evolution-data-server-gtk4
+Summary:	Vala API for Evolution data server GTK 4 UI library
+Summary(pl.UTF-8):	API języka Vala do biblioteki interfejsu użytkownika GTK 4 serwera danych Evolution
+Group:		X11/Development/Libraries
+Requires:	%{name}-gtk4-devel = %{version}-%{release}
+Requires:	vala-evolution-data-server = %{version}-%{release}
+BuildArch:	noarch
+
+%description -n vala-evolution-data-server-gtk4
+Vala API for Evolution data server GTK 4 UI library.
+
+%description -n vala-evolution-data-server-gtk4 -l pl.UTF-8
+API języka Vala do biblioteki interfejsu użytkownika GTK 4 serwera
+danych Evolution.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake .. \
+%cmake -B build \
 	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
 	%{?with_kerberos5:-DWITH_KRB5=%{_prefix} -DWITH_KRB5_LIBS=%{_libdir}} \
 	%{cmake_on_off kerberos5 WITH_KRB5} \
@@ -213,14 +286,13 @@ cd build
 	%{cmake_on_off goa ENABLE_GOA} \
 	-DENABLE_SCHEMAS_COMPILE=OFF \
 	-DENABLE_INTROSPECTION=ON \
-	%{?with_gweather4:-DWITH_GWEATHER4=ON} \
 	%{?with_phonenumber:-DWITH_PHONENUMBER=ON}
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/%{name}-%{basever},%{schemadir}}
+install -d $RPM_BUILD_ROOT%{schemadir}
 
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -251,6 +323,12 @@ if [ "$1" = "0" ]; then
 	%service -q ldap restart
 fi
 
+%post	gtk3-libs -p /sbin/ldconfig
+%postun	gtk3-libs -p /sbin/ldconfig
+
+%post	gtk4-libs -p /sbin/ldconfig
+%postun	gtk4-libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS* README
@@ -270,9 +348,8 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/addressbook-export
 %attr(755,root,root) %{_libexecdir}/%{name}/csv2vcard
 %attr(755,root,root) %{_libexecdir}/%{name}/evolution-alarm-notify
+%attr(755,root,root) %{_libexecdir}/%{name}/evolution-oauth2-handler
 %attr(755,root,root) %{_libexecdir}/%{name}/list-sources
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/libedbus-private.so
 %dir %{_libdir}/%{name}/addressbook-backends
 %attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendfile.so
 %attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendcarddav.so
@@ -313,15 +390,15 @@ fi
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-trust-prompt.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-webdav-backend.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-yahoo-backend.so
-%{_datadir}/evolution-data-server
+%dir %{_datadir}/evolution-data-server
+%{_datadir}/evolution-data-server/icons
 
 %{systemduserunitdir}/evolution-addressbook-factory.service
 %{systemduserunitdir}/evolution-calendar-factory.service
 %{systemduserunitdir}/evolution-source-registry.service
 %{systemduserunitdir}/evolution-user-prompter.service
 
-%dir %{_libdir}/%{name}-%{basever}
-%dir %{_datadir}/%{name}
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Evolution-alarm-notify.svg
 %{_pixmapsdir}/%{name}
 
 %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook10.service
@@ -339,6 +416,7 @@ fi
 
 %{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
 %{_desktopdir}/org.gnome.Evolution-alarm-notify.desktop
+%{_desktopdir}/org.gnome.evolution-data-server.OAuth2-handler.desktop
 
 %if %{with ldap}
 %files ldap
@@ -354,23 +432,23 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcamel-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.63
+%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.64
 %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.10
+%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.11
 %attr(755,root,root) %{_libdir}/libebook-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.20
+%attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.21
 %attr(755,root,root) %{_libdir}/libebook-contacts-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebook-contacts-%{apiver}.so.3
+%attr(755,root,root) %ghost %{_libdir}/libebook-contacts-%{apiver}.so.4
 %attr(755,root,root) %{_libdir}/libecal-%{cal_apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libecal-%{cal_apiver}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libecal-%{cal_apiver}.so.3
 %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.26
+%attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.27
 %attr(755,root,root) %{_libdir}/libedata-cal-%{cal_apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{cal_apiver}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{cal_apiver}.so.2
 %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.26
-%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver}.so.3
+%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.27
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libedbus-private.so
 %{_libdir}/girepository-1.0/Camel-1.2.typelib
 %{_libdir}/girepository-1.0/EBackend-%{apiver}.typelib
 %{_libdir}/girepository-1.0/EBook-%{apiver}.typelib
@@ -379,7 +457,6 @@ fi
 %{_libdir}/girepository-1.0/EDataBook-%{apiver}.typelib
 %{_libdir}/girepository-1.0/EDataCal-%{cal_apiver}.typelib
 %{_libdir}/girepository-1.0/EDataServer-%{apiver}.typelib
-%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib
 
 %files devel
 %defattr(644,root,root,755)
@@ -391,8 +468,15 @@ fi
 %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so
 %attr(755,root,root) %{_libdir}/libedata-cal-%{cal_apiver}.so
 %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so
-%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so
-%{_includedir}/evolution-data-server
+%dir %{_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
 %{_pkgconfigdir}/camel-%{apiver}.pc
 %{_pkgconfigdir}/evolution-data-server-%{apiver}.pc
 %{_pkgconfigdir}/libebackend-%{apiver}.pc
@@ -402,7 +486,6 @@ fi
 %{_pkgconfigdir}/libedata-book-%{apiver}.pc
 %{_pkgconfigdir}/libedata-cal-%{cal_apiver}.pc
 %{_pkgconfigdir}/libedataserver-%{apiver}.pc
-%{_pkgconfigdir}/libedataserverui-%{apiver}.pc
 %{_datadir}/gir-1.0/Camel-1.2.gir
 %{_datadir}/gir-1.0/EBackend-%{apiver}.gir
 %{_datadir}/gir-1.0/EBook-%{apiver}.gir
@@ -411,7 +494,6 @@ fi
 %{_datadir}/gir-1.0/EDataBook-%{apiver}.gir
 %{_datadir}/gir-1.0/EDataCal-%{cal_apiver}.gir
 %{_datadir}/gir-1.0/EDataServer-%{apiver}.gir
-%{_datadir}/gir-1.0/EDataServerUI-1.2.gir
 
 %if %{with apidocs}
 %files apidocs
@@ -439,6 +521,44 @@ fi
 %{_datadir}/vala/vapi/libedata-cal-%{cal_apiver}.vapi
 %{_datadir}/vala/vapi/libedataserver-%{apiver}.deps
 %{_datadir}/vala/vapi/libedataserver-%{apiver}.vapi
+%endif
+
+%files gtk3-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver}.so.4
+%{_libdir}/girepository-1.0/EDataServerUI-%{apiver}.typelib
+
+%files gtk3-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so
+%{_includedir}/evolution-data-server/libedataserverui
+%{_datadir}/gir-1.0/EDataServerUI-%{apiver}.gir
+%{_pkgconfigdir}/libedataserverui-%{apiver}.pc
+
+%if %{with vala}
+%files -n vala-evolution-data-server-gtk3
+%defattr(644,root,root,755)
 %{_datadir}/vala/vapi/libedataserverui-%{apiver}.deps
 %{_datadir}/vala/vapi/libedataserverui-%{apiver}.vapi
 %endif
+
+%files gtk4-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libedataserverui4-%{ui4_apiver}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libedataserverui4-%{ui4_apiver}.so.0
+%{_libdir}/girepository-1.0/EDataServerUI4-%{ui4_apiver}.typelib
+
+%files gtk4-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libedataserverui4-%{ui4_apiver}.so
+%{_datadir}/gir-1.0/EDataServerUI4-%{ui4_apiver}.gir
+%{_includedir}/evolution-data-server/libedataserverui4
+%{_pkgconfigdir}/libedataserverui4-%{ui4_apiver}.pc
+
+%if %{with vala}
+%files -n vala-evolution-data-server-gtk4
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libedataserverui4-%{ui4_apiver}.deps
+%{_datadir}/vala/vapi/libedataserverui4-%{ui4_apiver}.vapi
+%endif