From 08bebe9e32b43d19e63b6cff6c49fafa8c57a3b4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Feb 16 2015 15:43:45 +0000 Subject: Rebuild against newer evolution-data-server Add patch for a libpcrecpp build break --- diff --git a/syncevolution-1.5-pcrecpp-fix.patch b/syncevolution-1.5-pcrecpp-fix.patch new file mode 100644 index 0000000..0fd081a --- /dev/null +++ b/syncevolution-1.5-pcrecpp-fix.patch @@ -0,0 +1,12 @@ +diff -up syncevolution-1.5/src/gdbusxx/gdbusxx.am.pcrecpp-fix syncevolution-1.5/src/gdbusxx/gdbusxx.am +--- syncevolution-1.5/src/gdbusxx/gdbusxx.am.pcrecpp-fix 2015-02-16 16:40:22.253924027 +0100 ++++ syncevolution-1.5/src/gdbusxx/gdbusxx.am 2015-02-16 16:40:47.971922937 +0100 +@@ -11,7 +11,7 @@ src_gdbusxx_libgdbussyncevo_la_SOURCES = + src/gdbusxx/gdbus-cxx.h + + src_gdbusxx_libgdbussyncevo_la_LDFLAGS = $(src_gdbus_version_info) +-src_gdbusxx_libgdbussyncevo_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) ++src_gdbusxx_libgdbussyncevo_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(PCRECPP_LIBS) + src_gdbusxx_libgdbussyncevo_la_CXXFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(SYNCEVO_WFLAGS) + src_gdbusxx_libgdbussyncevo_la_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/src/ # allow access to libsyncevolution utility code + diff --git a/syncevolution.spec b/syncevolution.spec index 32e19fd..8450aee 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -1,7 +1,7 @@ Summary: SyncML client for evolution Name: syncevolution Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: LGPLv2+ Group: Applications/Productivity @@ -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-pcrecpp-fix.patch BuildRequires: pkgconfig(akonadi) BuildRequires: bluez-libs-devel @@ -87,6 +88,7 @@ Akonadi backend for %{name}. %prep %setup -q %patch0 -p1 -b .akonadi +%patch1 -p1 -b .pcrecpp-fix # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am @@ -197,6 +199,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/syncevolution/xml/*.pl %changelog +* Mon Feb 16 2015 Milan Crha - 1:1.5-3 +- Rebuild against newer evolution-data-server +- Add patch for a libpcrecpp build break + * Tue Jan 27 2015 Petr Machata - 1:1.5-2 - Rebuild for boost 1.57.0