From 926fb3c7a97dc9d4bed43caf7a8805e118686f4f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Jan 06 2020 16:45:05 +0000 Subject: Enable TNEF support for Fedora (RH Bug #1782987) --- diff --git a/evolution.spec b/evolution.spec index 1bd1981..b7041a7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,6 +4,11 @@ # correct Obsoletes for evolution-tests when this is changed %global enable_installed_tests 0 +%global tnef_support 0 +%if 0%{?fedora} +%global tnef_support 1 +%endif + %define glib2_version 2.46.0 %define gtk3_version 3.10.0 %define gnome_autoar_version 0.1.1 @@ -36,7 +41,7 @@ Name: evolution Version: 3.35.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -116,6 +121,10 @@ BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk_version} +%if %{tnef_support} +BuildRequires: pkgconfig(libytnef) +%endif + %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 %endif @@ -268,14 +277,19 @@ fi %define tests_flags -DENABLE_INSTALLED_TESTS=OFF %endif +%if %{tnef_support} +%global tnef_flags -DENABLE_YTNEF=ON +%else +%global tnef_flags -DENABLE_YTNEF=OFF +%endif + CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS %cmake -G "Unix Makefiles" \ -DENABLE_MAINTAINER_MODE=OFF \ -DVERSION_SUBSTRING=" (%{version}-%{release})" \ - %ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \ + %ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \ -DENABLE_PLUGINS=all \ - -DENABLE_YTNEF=OFF \ .. make %{?_smp_mflags} @@ -417,6 +431,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %{_libdir}/evolution/modules/module-webkit-editor.so %{_libdir}/evolution/modules/module-webkit-inspector.so +%if %{tnef_support} +%{_libdir}/evolution/modules/module-tnef-attachment.so +%endif + %{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so # Shared libraries: @@ -542,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Mon Jan 06 2020 Milan Crha - 3.35.3-2 +- Enable TNEF support for Fedora + * Fri Jan 03 2020 Milan Crha - 3.35.3-1 - Update to 3.35.3