diff --git a/evolution.spec b/evolution.spec index eb75eb0..c17e451 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,12 +43,12 @@ ### Abstract ### Name: evolution -Version: 3.45.2 -Release: 1%{?dist} +Version: 3.46.4 +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in @@ -59,6 +59,7 @@ Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} Obsoletes: evolution-perl < %{last_evo_perl_version} +Obsoletes: evolution-rss < 3.45.2 %if !%{enable_installed_tests} Obsoletes: evolution-tests <= 3.31.1 @@ -100,7 +101,6 @@ BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} -BuildRequires: pkgconfig(gcr-4-gtk3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} @@ -287,7 +287,14 @@ fi %global tnef_flags -DENABLE_YTNEF=OFF %endif -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS +%if 0%{?flatpak} +%global temp_home "-DTEMP_HOME=1" +%else +%global temp_home "" +%endif + +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home" +export CFLAGS %cmake -G "Unix Makefiles" \ -DENABLE_MAINTAINER_MODE=OFF \ @@ -296,7 +303,6 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated -DENABLE_PLUGINS=all \ %if 0%{?flatpak} "-DWITH_WMCLASS_OVERRIDE=evolution.bin" \ - "-DTEMP_HOME=1" \ %endif %{nil} @@ -571,6 +577,31 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Tue Feb 28 2023 Milan Crha - 3.46.4-2 +- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak) + +* Fri Feb 10 2023 Milan Crha - 3.46.4-1 +- Update to 3.46.4 + +* Fri Jan 06 2023 Milan Crha - 3.46.3-1 +- Update to 3.46.3 + +* Fri Dec 02 2022 Milan Crha - 3.46.2-1 +- Update to 3.46.2 + +* Fri Oct 21 2022 Milan Crha - 3.46.1-1 +- Update to 3.46.1 + +* Fri Sep 23 2022 Milan Crha - 3.46.0-2 +- Resolves: #2129068 (Busy loop when opening composer window) + +* Fri Sep 16 2022 Milan Crha - 3.46.0-1 +- Update to 3.46.0 + +* Fri Sep 02 2022 Milan Crha - 3.45.3-1 +- Update to 3.45.3 +- Obsolete evolution-rss + * Fri Aug 05 2022 Milan Crha - 3.45.2-1 - Update to 3.45.2 diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in index 1b42f20..6a311fc 100644 --- a/flatpak-evolution-wrapper.sh.in +++ b/flatpak-evolution-wrapper.sh.in @@ -5,7 +5,6 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then else export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/" export GIO_USE_NETWORK_MONITOR=base - export WEBKIT_FORCE_SANDBOX=0 gsettings reset org.gnome.evolution-data-server network-monitor-gio-name LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l) diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..1ba6977 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,5 @@ +--- +runpath: + allowed_paths: + - /usr/lib/evolution + - /usr/lib64/evolution diff --git a/sources b/sources index 9b24fc5..946a73f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.45.2.tar.xz) = ceed12be87dbe2f94a09da13ed71d9036e2d20ebc60df8854e27ba395184a4b9eeca97c9884e5dbd46da9b4f8ad21d9203b5ca2ad3292316ac8f999b11815392 +SHA512 (evolution-3.46.4.tar.xz) = 349270f84ee435452601e49a942478d9ef8060638b74135478b0f531bebc7be99019be749d7acb14237e9ff042e0443db30f053465ebc9f821263d86d8d8ae95