From 9bc9821ced3b797f680026f21f8252181fcc8c4d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Dec 21 2015 17:13:15 +0000 Subject: - build with the bundled libical to avoid breakage (#1225903) --- diff --git a/claws-mail.spec b/claws-mail.spec index 573a151..e8c02fe 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -9,8 +9,12 @@ License: GPLv3+ URL: http://claws-mail.org Source0: http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.xz -# rhbz#1079729 -Patch10: claws-mail-no-internal-libical.patch +# rhbz#1079729 - but system libical breaks -> rhbz#1225903 +#Patch10: claws-mail-no-internal-libical.patch +#BuildRequires: libical-devel +# version unknown and in ical headers replaced with Claws Mail version +Provides: bundled(libical) + # rhbz#1179279 Patch11: claws-mail-system-crypto-policies.patch @@ -39,10 +43,9 @@ BuildRequires: libetpan-devel >= 1.4.1 BuildRequires: compface-devel %endif BuildRequires: perl-devel perl(ExtUtils::Embed) -BuildRequires: libtool BuildRequires: libSM-devel BuildRequires: NetworkManager-glib-devel dbus-glib-devel -BuildRequires: autoconf automake +BuildRequires: libtool autoconf automake BuildRequires: docbook-utils docbook-utils-pdf BuildRequires: curl-devel @@ -61,7 +64,6 @@ BuildRequires: libcanberra-devel BuildRequires: libcanberra-gtk2 BuildRequires: libgdata-devel >= 0.6.4 BuildRequires: libgnome-devel -BuildRequires: libical-devel # provide plugin api version (see /usr/include/claws-mail/common/version.h) Provides: claws-mail(plugin-api)%{?_isa} = %pluginapi @@ -386,9 +388,9 @@ exporting of your meetings or all your calendars. %setup -q # remove bundled libical -rm -fr src/plugins/vcalendar/libical -%patch10 -p1 -b.ical -libtoolize -f ; autoreconf +#rm -fr src/plugins/vcalendar/libical +#patch10 -p1 -b.ical +#libtoolize -f ; autoreconf %if 0%{?fedora} > 20 %patch11 -p1 -b.syscrypto @@ -632,6 +634,7 @@ fi %changelog * Mon Dec 21 2015 Michael Schwendt - 3.13.1-2 +- build with the bundled libical to avoid breakage (#1225903) - merge the separate claws-mail-plugins meta-package * Sun Dec 20 2015 Michael Schwendt