Update to 3.45.1 (with some temporarily disabled parts)

f41
Milan Crha 3 years ago
parent 0f18adfc4c
commit 941f6907d9

@ -15,19 +15,20 @@
%global with_docs 0 %global with_docs 0
%endif %endif
%define glib2_version 2.46 %define glib2_version 2.68
%define gtk3_version 3.16 %define gtk3_version 3.20
%define gcr_version 3.4 %define gtk4_version 4.4
%define gcr_version 3.90
%define gtk_doc_version 1.9 %define gtk_doc_version 1.9
%define goa_version 3.8 %define goa_version 3.8
%define libsecret_version 0.5 %define libsecret_version 0.5
%define libgdata_version 0.15.1 %define libgweather_version 4.0
%define libgweather_version 3.10
%define libical_version 3.0.7 %define libical_version 3.0.7
%define libsoup_version 2.58 %define libsoup_version 3.1.1
%define nss_version 3.14 %define nss_version 3.14
%define sqlite_version 3.7.17 %define sqlite_version 3.7.17
%define webkit2gtk_version 2.28.0 %define webkit2gtk_version 2.34.0
#%define webkit2gtk4_version 2.36.0
%define json_glib_version 1.0.4 %define json_glib_version 1.0.4
%define credential_modules_dir %{_libdir}/evolution-data-server/credential-modules %define credential_modules_dir %{_libdir}/evolution-data-server/credential-modules
@ -52,12 +53,12 @@
### Abstract ### ### Abstract ###
Name: evolution-data-server Name: evolution-data-server
Version: 3.44.3 Version: 3.45.1
Release: 2%{?dist} Release: 1%{?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
Source: http://download.gnome.org/sources/%{name}/3.44/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz
Patch01: evolution-data-server-3.44.3-glib-none-flag.patch Patch01: evolution-data-server-3.44.3-glib-none-flag.patch
@ -86,28 +87,28 @@ BuildRequires: gperf
%if %{with_docs} %if %{with_docs}
BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: gtk-doc >= %{gtk_doc_version}
%endif %endif
BuildRequires: make BuildRequires: ninja-build
BuildRequires: vala BuildRequires: vala
BuildRequires: systemd BuildRequires: systemd
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version} BuildRequires: pkgconfig(gcr-4-gtk3) >= %{gcr_version}
BuildRequires: pkgconfig(gcr-base-3) >= %{gcr_version} BuildRequires: pkgconfig(gcr-4-gtk4) >= %{gcr_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(goa-1.0) >= %{goa_version} #BuildRequires: pkgconfig(goa-1.0) >= %{goa_version}
BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} BuildRequires: pkgconfig(gweather4) >= %{libgweather_version}
BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
BuildRequires: pkgconfig(libical-glib) >= %{libical_version} BuildRequires: pkgconfig(libical-glib) >= %{libical_version}
BuildRequires: pkgconfig(libsecret-unstable) >= %{libsecret_version} BuildRequires: pkgconfig(libsecret-unstable) >= %{libsecret_version}
BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nspr)
BuildRequires: pkgconfig(nss) >= %{nss_version} BuildRequires: pkgconfig(nss) >= %{nss_version}
BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version}
#BuildRequires: pkgconfig(webkit2gtk-5.0) >= %{webkit2gtk4_version}
BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
@ -139,14 +140,14 @@ by other packages.
Summary: Development files for building against %{name} Summary: Development files for building against %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig(goa-1.0) >= %{goa_version} #Requires: pkgconfig(goa-1.0) >= %{goa_version}
Requires: pkgconfig(libgdata) >= %{libgdata_version} Requires: pkgconfig(gweather4) >= %{libgweather_version}
Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
Requires: pkgconfig(libical-glib) >= %{libical_version} Requires: pkgconfig(libical-glib) >= %{libical_version}
Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version} Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version}
Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} Requires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
Requires: pkgconfig(sqlite3) >= %{sqlite_version} Requires: pkgconfig(sqlite3) >= %{sqlite_version}
Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} Requires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version}
#Requires: pkgconfig(webkit2gtk-5.0) >= %{webkit2gtk4_version}
Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version} Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
%description devel %description devel
@ -253,14 +254,17 @@ fi
export CPPFLAGS="-I%{_includedir}/et" export CPPFLAGS="-I%{_includedir}/et"
export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-deprecated-declarations" export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-deprecated-declarations"
%cmake -G "Unix Makefiles" \ %cmake -G Ninja \
-DENABLE_MAINTAINER_MODE=OFF \ -DENABLE_MAINTAINER_MODE=OFF \
-DWITH_LIBDB=OFF \ -DENABLE_GOA=OFF \
-DENABLE_GOOGLE=OFF \
-DENABLE_FILE_LOCKING=fcntl \ -DENABLE_FILE_LOCKING=fcntl \
-DENABLE_DOT_LOCKING=OFF \ -DENABLE_DOT_LOCKING=OFF \
-DENABLE_INTROSPECTION=ON \ -DENABLE_INTROSPECTION=ON \
-DENABLE_OAUTH2_WEBKITGTK4=OFF \
-DENABLE_VALA_BINDINGS=ON \ -DENABLE_VALA_BINDINGS=ON \
-DENABLE_INSTALLED_TESTS=ON \ -DENABLE_INSTALLED_TESTS=ON \
-DWITH_LIBDB=OFF \
-DWITH_SYSTEMDUSERUNITDIR=%{_userunitdir} \ -DWITH_SYSTEMDUSERUNITDIR=%{_userunitdir} \
%if "%{?_eds_dbus_services_prefix}" != "" %if "%{?_eds_dbus_services_prefix}" != ""
-DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \ -DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \
@ -276,6 +280,7 @@ 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} || :
mkdir $RPM_BUILD_ROOT/%{credential_modules_dir} || :
# 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 {} \;
@ -285,24 +290,26 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%files %files
%license COPYING %license COPYING
%doc README ChangeLog NEWS %doc README ChangeLog NEWS
%{_libdir}/libcamel-1.2.so.63 %{_libdir}/libcamel-1.2.so.64
%{_libdir}/libcamel-1.2.so.63.0.0 %{_libdir}/libcamel-1.2.so.64.0.0
%{_libdir}/libebackend-1.2.so.10 %{_libdir}/libebackend-1.2.so.11
%{_libdir}/libebackend-1.2.so.10.0.0 %{_libdir}/libebackend-1.2.so.11.0.0
%{_libdir}/libebook-1.2.so.20 %{_libdir}/libebook-1.2.so.21
%{_libdir}/libebook-1.2.so.20.1.3 %{_libdir}/libebook-1.2.so.21.1.3
%{_libdir}/libebook-contacts-1.2.so.3 %{_libdir}/libebook-contacts-1.2.so.4
%{_libdir}/libebook-contacts-1.2.so.3.0.0 %{_libdir}/libebook-contacts-1.2.so.4.0.0
%{_libdir}/libecal-2.0.so.1 %{_libdir}/libecal-2.0.so.2
%{_libdir}/libecal-2.0.so.1.0.0 %{_libdir}/libecal-2.0.so.2.0.0
%{_libdir}/libedata-book-1.2.so.26 %{_libdir}/libedata-book-1.2.so.27
%{_libdir}/libedata-book-1.2.so.26.0.0 %{_libdir}/libedata-book-1.2.so.27.0.0
%{_libdir}/libedata-cal-2.0.so.1 %{_libdir}/libedata-cal-2.0.so.2
%{_libdir}/libedata-cal-2.0.so.1.0.0 %{_libdir}/libedata-cal-2.0.so.2.0.0
%{_libdir}/libedataserver-1.2.so.26 %{_libdir}/libedataserver-1.2.so.27
%{_libdir}/libedataserver-1.2.so.26.0.0 %{_libdir}/libedataserver-1.2.so.27.0.0
%{_libdir}/libedataserverui-1.2.so.3 %{_libdir}/libedataserverui-1.2.so.4
%{_libdir}/libedataserverui-1.2.so.3.0.0 %{_libdir}/libedataserverui-1.2.so.4.0.0
%{_libdir}/libedataserverui4-1.0.so.0
%{_libdir}/libedataserverui4-1.0.so.0.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
@ -313,6 +320,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_libdir}/girepository-1.0/EDataCal-2.0.typelib %{_libdir}/girepository-1.0/EDataCal-2.0.typelib
%{_libdir}/girepository-1.0/EDataServer-1.2.typelib %{_libdir}/girepository-1.0/EDataServer-1.2.typelib
%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib %{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib
%{_libdir}/girepository-1.0/EDataServerUI4-1.0.typelib
%{_libexecdir}/camel-gpg-photo-saver %{_libexecdir}/camel-gpg-photo-saver
%{_libexecdir}/camel-index-control-1.2 %{_libexecdir}/camel-index-control-1.2
@ -384,20 +392,20 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{camel_provider_dir}/libcamelsmtp.urls %{camel_provider_dir}/libcamelsmtp.urls
# e-d-s extensions: # e-d-s extensions:
%{credential_modules_dir}/module-credentials-goa.so #%{credential_modules_dir}/module-credentials-goa.so
%{ebook_backends_dir}/libebookbackendcarddav.so %{ebook_backends_dir}/libebookbackendcarddav.so
%{ebook_backends_dir}/libebookbackendfile.so %{ebook_backends_dir}/libebookbackendfile.so
%{ebook_backends_dir}/libebookbackendldap.so %{ebook_backends_dir}/libebookbackendldap.so
%{ecal_backends_dir}/libecalbackendcaldav.so %{ecal_backends_dir}/libecalbackendcaldav.so
%{ecal_backends_dir}/libecalbackendcontacts.so %{ecal_backends_dir}/libecalbackendcontacts.so
%{ecal_backends_dir}/libecalbackendfile.so %{ecal_backends_dir}/libecalbackendfile.so
%{ecal_backends_dir}/libecalbackendgtasks.so #%{ecal_backends_dir}/libecalbackendgtasks.so
%{ecal_backends_dir}/libecalbackendhttp.so %{ecal_backends_dir}/libecalbackendhttp.so
%{ecal_backends_dir}/libecalbackendweather.so %{ecal_backends_dir}/libecalbackendweather.so
%{ecal_backends_dir}/libecalbackendwebdavnotes.so %{ecal_backends_dir}/libecalbackendwebdavnotes.so
%{modules_dir}/module-cache-reaper.so %{modules_dir}/module-cache-reaper.so
%{modules_dir}/module-google-backend.so %{modules_dir}/module-google-backend.so
%{modules_dir}/module-gnome-online-accounts.so #%{modules_dir}/module-gnome-online-accounts.so
%{modules_dir}/module-oauth2-services.so %{modules_dir}/module-oauth2-services.so
%{modules_dir}/module-outlook-backend.so %{modules_dir}/module-outlook-backend.so
%{modules_dir}/module-secret-monitor.so %{modules_dir}/module-secret-monitor.so
@ -416,6 +424,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_libdir}/libedata-cal-2.0.so %{_libdir}/libedata-cal-2.0.so
%{_libdir}/libedataserver-1.2.so %{_libdir}/libedataserver-1.2.so
%{_libdir}/libedataserverui-1.2.so %{_libdir}/libedataserverui-1.2.so
%{_libdir}/libedataserverui4-1.0.so
%{_libdir}/pkgconfig/camel-1.2.pc %{_libdir}/pkgconfig/camel-1.2.pc
%{_libdir}/pkgconfig/evolution-data-server-1.2.pc %{_libdir}/pkgconfig/evolution-data-server-1.2.pc
%{_libdir}/pkgconfig/libebackend-1.2.pc %{_libdir}/pkgconfig/libebackend-1.2.pc
@ -426,6 +435,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_libdir}/pkgconfig/libedata-cal-2.0.pc %{_libdir}/pkgconfig/libedata-cal-2.0.pc
%{_libdir}/pkgconfig/libedataserver-1.2.pc %{_libdir}/pkgconfig/libedataserver-1.2.pc
%{_libdir}/pkgconfig/libedataserverui-1.2.pc %{_libdir}/pkgconfig/libedataserverui-1.2.pc
%{_libdir}/pkgconfig/libedataserverui4-1.0.pc
%{_datadir}/gir-1.0/Camel-1.2.gir %{_datadir}/gir-1.0/Camel-1.2.gir
%{_datadir}/gir-1.0/EBackend-1.2.gir %{_datadir}/gir-1.0/EBackend-1.2.gir
%{_datadir}/gir-1.0/EBook-1.2.gir %{_datadir}/gir-1.0/EBook-1.2.gir
@ -435,6 +445,7 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/gir-1.0/EDataCal-2.0.gir %{_datadir}/gir-1.0/EDataCal-2.0.gir
%{_datadir}/gir-1.0/EDataServer-1.2.gir %{_datadir}/gir-1.0/EDataServer-1.2.gir
%{_datadir}/gir-1.0/EDataServerUI-1.2.gir %{_datadir}/gir-1.0/EDataServerUI-1.2.gir
%{_datadir}/gir-1.0/EDataServerUI4-1.0.gir
%{_datadir}/vala/vapi/camel-1.2.deps %{_datadir}/vala/vapi/camel-1.2.deps
%{_datadir}/vala/vapi/camel-1.2.vapi %{_datadir}/vala/vapi/camel-1.2.vapi
%{_datadir}/vala/vapi/libebackend-1.2.deps %{_datadir}/vala/vapi/libebackend-1.2.deps
@ -453,6 +464,8 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/vala/vapi/libedataserver-1.2.vapi %{_datadir}/vala/vapi/libedataserver-1.2.vapi
%{_datadir}/vala/vapi/libedataserverui-1.2.deps %{_datadir}/vala/vapi/libedataserverui-1.2.deps
%{_datadir}/vala/vapi/libedataserverui-1.2.vapi %{_datadir}/vala/vapi/libedataserverui-1.2.vapi
%{_datadir}/vala/vapi/libedataserverui4-1.0.deps
%{_datadir}/vala/vapi/libedataserverui4-1.0.vapi
%files langpacks -f %{name}.lang %files langpacks -f %{name}.lang
@ -474,6 +487,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Tue Jul 19 2022 Milan Crha <mcrha@redhat.com> - 3.45.1-1
- Update to 3.45.1
* Mon Jul 18 2022 Milan Crha <mcrha@redhat.com> - 3.44.3-2 * Mon Jul 18 2022 Milan Crha <mcrha@redhat.com> - 3.44.3-2
- Add patch for RH bug #2107751 (glib2's G_TLS_CERTIFICATE_FLAGS_NONE causes infinite loop) - Add patch for RH bug #2107751 (glib2's G_TLS_CERTIFICATE_FLAGS_NONE causes infinite loop)

@ -1 +1 @@
SHA512 (evolution-data-server-3.44.3.tar.xz) = b03b1c52a93a3f4fa5eece998eea075086e232953e8485f0b551bd7bfebbbf935288052d55cfaf3ff57b121b14f64db2ac8ce41d54d27aab39e683c4d3b54cac SHA512 (evolution-data-server-3.45.1.tar.xz) = 6c1d353ca42404b6d8fdd65d64634e13d2ca25bd9961b855db4c6c596f7194efcb9f998714668917a49673cbb6dad865f0bfd832630c6e0effe0ec5f996fc83b

Loading…
Cancel
Save