From a53ce39a06ba73e210fd229690392bea8e800d20 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Jan 19 2016 10:15:32 +0000 Subject: Add patch to build against libical 2.0.0 --- diff --git a/syncevolution-1.5.1-libical2.patch b/syncevolution-1.5.1-libical2.patch new file mode 100644 index 0000000..09676c8 --- /dev/null +++ b/syncevolution-1.5.1-libical2.patch @@ -0,0 +1,12 @@ +diff -up syncevolution-1.5.1/src/syncevo/icaltz-util.c.libical2 syncevolution-1.5.1/src/syncevo/icaltz-util.c +--- syncevolution-1.5.1/src/syncevo/icaltz-util.c.libical2 2014-04-28 11:55:52.000000000 +0200 ++++ syncevolution-1.5.1/src/syncevo/icaltz-util.c 2016-01-19 10:04:32.090379654 +0100 +@@ -162,7 +162,7 @@ typedef struct + } leap; + + #ifndef EVOLUTION_ICAL_COMPATIBILITY +-extern const char *ical_tzid_prefix; ++const char *ical_tzid_prefix = "/freeassociation.sourceforge.net/"; + #endif + + static int diff --git a/syncevolution.spec b/syncevolution.spec index b98d3b8..5408387 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -9,6 +9,7 @@ URL: http://syncevolution.org/ Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz Patch0: syncevolution-1.4.1-akonadi.patch +Patch1: syncevolution-1.5.1-libical2.patch BuildRequires: pkgconfig(akonadi) BuildRequires: bluez-libs-devel @@ -23,7 +24,7 @@ BuildRequires: kdelibs-devel BuildRequires: kdepimlibs-devel BuildRequires: libcurl-devel BuildRequires: libgnome-keyring-devel -BuildRequires: libical-devel +BuildRequires: libical-devel >= 2.0.0 BuildRequires: libnotify-devel BuildRequires: libsoup-devel BuildRequires: neon-devel @@ -87,6 +88,7 @@ Akonadi backend for %{name}. %prep %setup -q %patch0 -p1 -b .akonadi +%patch1 -p1 -b .libical2 # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am @@ -199,6 +201,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Jan 18 2016 Milan Crha - 1:1.5.1-7 - Rebuild for newer evolution-data-server +- Add patch to build against libical 2.0.0 * Thu Aug 27 2015 Jonathan Wakely - 1:1.5.1-6 - Rebuilt for Boost 1.59