diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 6146a43beb09b2ef8aa454e64b3872f6d0abd0d6..103c2be3f1befed337c66350ac4e842b175536de 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -37,11 +37,11 @@ Name: evolution-data-server Version: 3.46.2 -Release: 2 +Release: 3 Summary: Backend data server for Evolution -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz #Patch0: webkitgtk-6.0.patch @@ -146,8 +146,6 @@ fi export CPPFLAGS="-I%{_includedir}/et" export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-deprecated-declarations" -mkdir -p build -pushd build %cmake -G Ninja -DENABLE_MAINTAINER_MODE=OFF -DWITH_LIBDB=OFF \ -DENABLE_FILE_LOCKING=fcntl -DENABLE_DOT_LOCKING=OFF -DENABLE_INTROSPECTION=ON \ -DWITH_SYSTEMDUSERUNITDIR=%{_userunitdir} \ @@ -155,17 +153,13 @@ pushd build -DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \ %endif -DENABLE_VALA_BINDINGS=ON -DENABLE_INSTALLED_TESTS=ON -DWITH_OPENLDAP=ON -DWITH_KRB5=ON \ - -DENABLE_SMIME=ON -DENABLE_LARGEFILE=ON -DENABLE_SMIME=ON -DENABLE_GTK_DOC=ON -DWITH_PHONENUMBER=OFF \ - .. + -DENABLE_SMIME=ON -DENABLE_LARGEFILE=ON -DENABLE_SMIME=ON -DENABLE_GTK_DOC=ON -DWITH_PHONENUMBER=OFF sed -i "302 d" docs/reference/evolution-data-server/evolution-data-server-docs.sgml -ninja -j1 -popd +%cmake_build -j1 %install -pushd build -DESTDIR=$RPM_BUILD_ROOT ninja install -popd +%cmake_install mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || : @@ -200,17 +194,11 @@ file `find %{buildroot}%{_libexecdir}/%{name}/installed-tests -type f` | grep -w mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf -%post -p /sbin/ldconfig +%post +/sbin/ldconfig %postun /sbin/ldconfig -if [ $1 -eq 0 ] ; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -fi - -%posttrans -glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : - %files %license COPYING @@ -410,6 +398,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libexecdir}/evolution-data-server/csv2vcard %changelog +* Wed Nov 20 2024 Funda Wang - 3.46.2-3 +- adopt to new cmake macro + * Sat Mar 04 2023 wangkai - 3.46.2-2 - Remove rpath in installed-tests diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch deleted file mode 100644 index 37f7df50c105f90bd1625e3fe279a153b9506cea..0000000000000000000000000000000000000000 --- a/webkitgtk-6.0.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cdb16f26f63f5093479a43cab32012845bcf33ed Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Tue, 15 Nov 2022 08:58:38 +0000 -Subject: [PATCH] M!107 - Use webkitgtk-6.0 API version - -In WebKitGTK 2.39.1, the GTK 4 API version has been renamed from webkit2gtk-5.0 to webkitgtk-6.0. - -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/107 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3ce7c1dd..c575acd3e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -426,7 +426,7 @@ if(ENABLE_GTK4) - - if(ENABLE_OAUTH2_WEBKITGTK4) - pkg_check_modules_for_option(ENABLE_OAUTH2_WEBKITGTK4 "WebKitGTK gtk4 for built-in OAuth2 authentications" OAUTH2_WEBKITGTK4 -- webkit2gtk-5.0>=${webkit2gtk4_minimum_version} -+ webkitgtk-6.0>=${webkit2gtk4_minimum_version} - ) - endif(ENABLE_OAUTH2_WEBKITGTK4) - endif(ENABLE_GTK4) --- -GitLab - -From 8d29b0bded2e4e3700ce08e9db2eaeac4400528a Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 21 Nov 2022 17:49:29 +0000 -Subject: [PATCH] M!108 - Try harder to support webkitgtk-6.0 - -The cdb16f26f63f5093479a43cab32012845bcf33ed attempted to handle WebKitGTK -API changes, but I forgot the header file name changed as well. - -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/108 ---- - src/libedataserverui/e-credentials-prompter-impl-oauth2.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c -index 2415947c3..b99ac4e60 100644 ---- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c -+++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c -@@ -32,21 +32,19 @@ - #if GTK_CHECK_VERSION(4, 0, 0) - #ifdef ENABLE_OAUTH2_WEBKITGTK4 - #define WITH_WEBKITGTK 1 -+#include - #else - #undef WITH_WEBKITGTK - #endif - #else - #ifdef ENABLE_OAUTH2_WEBKITGTK - #define WITH_WEBKITGTK 1 -+#include - #else - #undef WITH_WEBKITGTK - #endif - #endif - --#ifdef WITH_WEBKITGTK --#include --#endif /* WITH_WEBKITGTK */ -- - struct _ECredentialsPrompterImplOAuth2Private { - GMutex property_lock; - --- -GitLab -