Hello community, here is the log from the commit of package libkpeople for openSUSE:Factory checked in at 2014-02-20 07:49:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkpeople (Old) and /work/SRC/openSUSE:Factory/.libkpeople.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkpeople" Changes: -------- --- /work/SRC/openSUSE:Factory/libkpeople/libkpeople.changes 2013-10-30 15:44:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkpeople.new/libkpeople.changes 2014-02-20 07:49:39.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 18 18:58:14 UTC 2014 - [email protected] + +- Update to 0.2.0 + * New upstream release, library now uses kdepimlibs instead of + nepomuk2 +- Added 0001-Emit-finished-if-there-are-no-akonadi-collections.patch, + from upstream (and recommended by upstream) + +------------------------------------------------------------------- Old: ---- libkpeople-0.1.0.tar.bz2 New: ---- 0001-Emit-finished-if-there-are-no-akonadi-collections.patch libkpeople-0.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkpeople.spec ++++++ --- /var/tmp/diff_new_pack.gxd0SL/_old 2014-02-20 07:49:40.000000000 +0100 +++ /var/tmp/diff_new_pack.gxd0SL/_new 2014-02-20 07:49:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkpeople # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,20 @@ # -%define soversion 1 +%define soversion 3 Name: libkpeople -Version: 0.1.0 +Version: 0.2.0 Release: 0 Summary: Provides access to all contacts and the people who hold them License: LGPL-2.1+ Group: Development/Libraries/Other Url: https://projects.kde.org/projects/playground/network/libkpeople -Source0: http://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-Emit-finished-if-there-are-no-akonadi-collections.patch +Patch0: 0001-Emit-finished-if-there-are-no-akonadi-collections.patch BuildRequires: libkde4-devel >= 4.10.1 -BuildRequires: libsoprano-devel -BuildRequires: nepomuk-core-devel -BuildRequires: shared-desktop-ontologies-devel +BuildRequires: libkdepimlibs4-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,8 +47,8 @@ %package devel Summary: Provides access to all contacts and the people who hold them Group: Development/Libraries/Other +Requires: libkdepimlibs4-devel Requires: libkpeople%{soversion} = %{version} -Requires: nepomuk-core-devel %description devel A library that provides access to all contacts and the people who hold them @@ -65,6 +65,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kde4 -d build @@ -87,20 +88,17 @@ %doc COPYING %{_kde4_libdir}/libkpeople*.so.* %{_kde4_appsdir}/kpeople/ -%{_kde4_modulesdir}/email_kpeople_plugin.so -%{_kde4_modulesdir}/*widgetplugin.so -%{_kde4_servicesdir}/*widgetplugin.desktop -%{_kde4_servicesdir}/email_kpeople_plugin.desktop +%{_kde4_modulesdir}/akonadi_kpeople_plugin.so +%{_kde4_servicesdir}/akonadi_kpeople_plugin.desktop %{_kde4_servicetypesdir}/kpeople_*.desktop %{_kde4_servicetypesdir}/persondetailsplugin.desktop -%{_kde4_modulesdir}/imports/ %files devel %defattr(-,root,root) %doc COPYING %{_kde4_libdir}/libkpeople.so %{_kde4_libdir}/libkpeoplewidgets.so -%{_kde4_appsdir}/cmake/modules/FindKPeople.cmake +%{_kde4_libdir}/cmake/KPeople/ %{_kde4_includedir}/KPeople/ %{_kde4_includedir}/kpeople/ ++++++ 0001-Emit-finished-if-there-are-no-akonadi-collections.patch ++++++ >From d3ab42da427d696543f2db451cfc68820e7f734b Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Tue, 18 Feb 2014 12:54:05 +0100 Subject: [PATCH 1/1] Emit finished if there are no akonadi collections --- src/plugins/akonadi/akonadidatasource.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/akonadi/akonadidatasource.cpp b/src/plugins/akonadi/akonadidatasource.cpp index 2405406..2f006c9 100644 --- a/src/plugins/akonadi/akonadidatasource.cpp +++ b/src/plugins/akonadi/akonadidatasource.cpp @@ -153,6 +153,9 @@ void AkonadiAllContacts::onCollectionsFetched(KJob* job) ++m_activeFetchJobsCount; } } + if (m_activeFetchJobsCount == 0) { + emitInitialFetchComplete(); + } } -- 1.8.5.2 ++++++ libkpeople-0.1.0.tar.bz2 -> libkpeople-0.2.0.tar.bz2 ++++++ ++++ 9924 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
