diff --git a/syncevolution-1.4.1-akonadi.patch b/syncevolution-1.4.1-akonadi.patch new file mode 100644 index 0000000..2fe90d9 --- /dev/null +++ b/syncevolution-1.4.1-akonadi.patch @@ -0,0 +1,12 @@ +diff -up syncevolution-1.4.1/src/backends/akonadi/configure-sub.in.akon syncevolution-1.4.1/src/backends/akonadi/configure-sub.in +--- syncevolution-1.4.1/src/backends/akonadi/configure-sub.in.akon 2014-06-26 18:18:55.670424479 +0200 ++++ syncevolution-1.4.1/src/backends/akonadi/configure-sub.in 2014-06-26 18:19:08.118423952 +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 08a4d71..0d50311 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -1,13 +1,16 @@ Summary: SyncML client for evolution Name: syncevolution Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: LGPLv2+ 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 BuildRequires: cppunit-devel @@ -16,6 +19,8 @@ BuildRequires: expat-devel BuildRequires: glib2-devel BuildRequires: gnome-online-accounts-devel BuildRequires: gtk3-devel +BuildRequires: kdelibs-devel +BuildRequires: kdepimlibs-devel BuildRequires: libcurl-devel BuildRequires: libgnome-keyring-devel BuildRequires: libical-devel @@ -26,6 +31,7 @@ BuildRequires: pcre-devel BuildRequires: python-docutils BuildRequires: unique3-devel %ifnarch s390 s390x +BuildRequires: pkgconfig(gnome-bluetooth-1.0) BuildRequires: openobex-devel %endif @@ -72,8 +78,16 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description perl Perl utils for use with %{name}. +%package libs-akonadi +Summary: Akonadi backend package for %{name} +Group: System Environment/Libraries + +%description libs-akonadi +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 @@ -85,11 +99,12 @@ autoreconf -fiv %configure --enable-libsoup --enable-dbus-service --enable-shared \ --disable-static --enable-gtk=3 --enable-gui --with-gio-gdbus \ - --enable-dav --disable-static --enable-gtk=3 --enable-gui --enable-gnome-keyring \ + --enable-dav --disable-static --enable-gtk=3 --enable-gui \ + --enable-gnome-keyring --enable-akonadi --enable-pbap \ %ifnarch s390 s390x - --enable-bluetooth + --enable-bluetooth --enable-gnome-bluetooth-panel-plugin %else - --disable-bluetooth + --disable-bluetooth --disable-gnome-bluetooth-panel-plugin %endif sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g @@ -142,12 +157,32 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/dbus-1/services/org.syncevolution.service %{_datadir}/man/man1/syncevolution.1.gz %exclude %{_datadir}/syncevolution/xml/*.pl +%ifnarch s390 s390x +%{_libdir}/gnome-bluetooth/plugins/libgbtsyncevolution.so +%endif %files libs %doc COPYING LICENSE.LGPL-21 LICENSE.txt %{_libdir}/*so.0* %dir %{_libdir}/syncevolution -%{_libdir}/syncevolution/backends +%{_libdir}/syncevolution/backends/platformgnome.so +%{_libdir}/syncevolution/backends/platformkde.so +%{_libdir}/syncevolution/backends/providergoa.so +%{_libdir}/syncevolution/backends/syncactivesync.so +%{_libdir}/syncevolution/backends/syncaddressbook.so +%{_libdir}/syncevolution/backends/syncdav.so +%{_libdir}/syncevolution/backends/syncebook.so +%{_libdir}/syncevolution/backends/syncecal.so +%{_libdir}/syncevolution/backends/syncfile.so +%{_libdir}/syncevolution/backends/synckcalextended.so +%{_libdir}/syncevolution/backends/syncmaemocal.so +%{_libdir}/syncevolution/backends/syncpbap.so +%{_libdir}/syncevolution/backends/syncqtcontacts.so +%{_libdir}/syncevolution/backends/syncsqlite.so +%{_libdir}/syncevolution/backends/syncxmlrpc.so + +%files libs-akonadi +%{_libdir}/syncevolution/backends/syncakonadi.so %files devel %{_includedir}/syncevo @@ -167,6 +202,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/syncevolution/xml/*.pl %changelog +* Fri Jun 27 2014 Milan Crha - 1:1.4.1-4 +- Enable Akonadi and pbap backends, together with GNOME Bluetooth Panel plugin + * Sun Jun 08 2014 Fedora Release Engineering - 1:1.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild