Hello community,
here is the log from the commit of package kdepim4 for openSUSE:Factory checked
in at 2012-01-09 16:01:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old)
and /work/SRC/openSUSE:Factory/.kdepim4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2011-12-14
14:33:34.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2012-01-09
16:01:07.000000000 +0100
@@ -7,0 +8,7 @@
+Wed Dec 7 12:18:32 UTC 2011 - wstephen...@suse.com
+
+- Don't index email unless a folder is selected for indexing
+- Don't show Time Tracker kontact plugin unless the ktimetracker
+ package is installed (bnc#731268)
+
+-------------------------------------------------------------------
New:
----
akonadi_nepomuk_email_default_indexing.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.q9q29l/_old 2012-01-09 16:01:08.000000000 +0100
+++ /var/tmp/diff_new_pack.q9q29l/_new 2012-01-09 16:01:08.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kdepim4
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -29,6 +29,7 @@
Patch2: desktop-files.diff
Patch3: knode-kontact-default.diff
Patch4: make-kmail-faster.patch
+Patch5: akonadi_nepomuk_email_default_indexing.diff
BuildRequires: fdupes
BuildRequires: gpgme-devel
BuildRequires: grantlee-devel
@@ -65,6 +66,7 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%build
%ifarch ppc64
@@ -105,7 +107,8 @@
knodeplugin="%{_kde4_modulesdir}/kontact_knodeplugin.so
%{_kde4_servicesdir}/kontact/knodeplugin.desktop"
knotesplugin="%{_kde4_modulesdir}/kontact_knotesplugin.so
%{_kde4_servicesdir}/kontact/knotesplugin.desktop"
korganizerplugins="%{_kde4_modulesdir}/kontact_journalplugin.so
%{_kde4_modulesdir}/kontact_korganizerplugin.so
%{_kde4_modulesdir}/kontact_todoplugin.so
%{_kde4_servicesdir}/kontact/korganizerplugin.desktop
%{_kde4_servicesdir}/kontact/journalplugin.desktop
%{_kde4_servicesdir}/kontact/todoplugin.desktop"
- for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin
$knodeplugin $knotesplugin $korganizerplugins
+ ktimetrackerplugin="%{_kde4_modulesdir}/kontact_ktimetrackerplugin.so
%{_kde4_servicesdir}/kontact/ktimetracker_plugin.desktop"
+ for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin
$knodeplugin $knotesplugin $korganizerplugins $ktimetrackerplugin
do
sed -ri s,$i,, filelists/kontact
done
@@ -137,6 +140,10 @@
do
echo $i >> filelists/korganizer
done
+ for i in $ktimetrackerplugin
+ do
+ echo $i >> filelists/ktimetracker
+ done
sed -ri s,.*/usr/%{_lib}/libkabcommon.so.*,, filelists/kaddressbook
++++++ akonadi_nepomuk_email_default_indexing.diff ++++++
Index: kdepim-4.7.2/nepomuk_email_feeder/shared/nepomukfeederagentbase.cpp
===================================================================
--- kdepim-4.7.2.orig/nepomuk_email_feeder/shared/nepomukfeederagentbase.cpp
+++ kdepim-4.7.2/nepomuk_email_feeder/shared/nepomukfeederagentbase.cpp
@@ -76,10 +76,13 @@ static inline bool indexingDisabled( con
return true;
IndexPolicyAttribute *indexPolicy =
collection.attribute<IndexPolicyAttribute>();
- if ( indexPolicy && !indexPolicy->indexingEnabled() )
- return true;
+ if ( indexPolicy ) {
+ if ( indexPolicy->indexingEnabled() ) {
+ return false;
+ }
+ }
- return false;
+ return true;
}
NepomukFeederAgentBase::NepomukFeederAgentBase(const QString& id) :
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
