From e23561ec560ec82d58b85700b85256ec8e4afa7a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Jun 09 2015 12:57:00 +0000 Subject: Return back mistakenly removed syncevolution-1.4.1-akonadi.patch --- diff --git a/syncevolution-1.4.1-akonadi.patch b/syncevolution-1.4.1-akonadi.patch new file mode 100644 index 0000000..d57df4d --- /dev/null +++ b/syncevolution-1.4.1-akonadi.patch @@ -0,0 +1,12 @@ +diff -up syncevolution-1.5.1/src/backends/akonadi/configure-sub.in.akonadi syncevolution-1.5.1/src/backends/akonadi/configure-sub.in +--- syncevolution-1.5.1/src/backends/akonadi/configure-sub.in.akonadi 2015-06-09 14:55:29.814137191 +0200 ++++ syncevolution-1.5.1/src/backends/akonadi/configure-sub.in 2015-06-09 14:55:58.152135990 +0200 +@@ -14,7 +14,7 @@ if ! test "$KDEPIM_CFLAGS"; then + fi + fi + if ! test "$KDEPIM_LIBS"; then +- KDEPIM_LIBS="-L`kde4-config --install lib` -lakonadi-kde `${PKG_CONFIG} --libs QtDBus` -lQtCore -lkdeui -lkdecore" ++ KDEPIM_LIBS="-L`kde4-config --install lib` -lakonadi-kde `${PKG_CONFIG} --libs QtDBus` -lQtCore" + fi + AC_LANG_PUSH(C++) + old_CPPFLAGS="$CPPFLAGS" diff --git a/syncevolution.spec b/syncevolution.spec index 5e53177..f157942 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -8,6 +8,8 @@ Group: Applications/Productivity URL: http://syncevolution.org/ Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz +Patch0: syncevolution-1.4.1-akonadi.patch + BuildRequires: pkgconfig(akonadi) BuildRequires: bluez-libs-devel BuildRequires: boost-devel @@ -84,6 +86,7 @@ Akonadi backend for %{name}. %prep %setup -q +%patch0 -p1 -b .akonadi # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am