diff --git a/akonadi-1.13.0-libs_only.patch b/akonadi-1.13.0-libs_only.patch index 73da4ca..96f48cd 100644 --- a/akonadi-1.13.0-libs_only.patch +++ b/akonadi-1.13.0-libs_only.patch @@ -6,7 +6,7 @@ diff -up akonadi-1.13.0/CMakeLists.txt.opt akonadi-1.13.0/CMakeLists.txt include_directories(${Akonadi_SOURCE_DIR} ${Akonadi_BINARY_DIR} ${QT_INCLUDES} ${Boost_INCLUDE_DIR}) -add_subdirectory(interfaces) -+#add_subdirectory(interfaces) ++add_subdirectory(interfaces) add_subdirectory(libs) set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals) diff --git a/akonadi.spec b/akonadi.spec index 9408bae..7ebe0a5 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 100%{?dist} +Release: 101%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(shared-mime-info) %package devel Summary: Developer files for %{name} +Conflicts: kf5-akonadi-server-devel Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. @@ -108,9 +109,13 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadiprotocolinternals.so %{_libdir}/cmake/Akonadi/ +%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %changelog +* Thu Dec 17 2015 Rex Dieter 1.13.0-101 +- -devel: re-enable dbus-1/interfaces, Conflicts: kf5-akonadi-server-devel + * Fri Dec 11 2015 Rex Dieter 1.13.0-100 - for kf5 kdepim world, build libakonadi bits only (omit server and related files)