From 1577f329cb739bae11d343305a5522930318a49d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 20 2010 11:28:19 +0000 Subject: - akonadi-1.3.0 --- diff --git a/.cvsignore b/.cvsignore index edb4432..d2bbb48 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -akonadi-1.2.90.tar.bz2 +akonadi-1.3.0.tar.bz2 diff --git a/akonadi-1.2.90-kde#219687.patch b/akonadi-1.2.90-kde#219687.patch deleted file mode 100644 index 80cbd7a..0000000 --- a/akonadi-1.2.90-kde#219687.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- trunk/kdesupport/akonadi/server/src/nepomuksearch.cpp 2009/11/30 08:35:25 1056440 -+++ trunk/kdesupport/akonadi/server/src/nepomuksearch.cpp 2010/01/19 17:57:13 1077216 -@@ -42,13 +42,9 @@ - NepomukSearch::NepomukSearch( QObject* parent ) - : QObject( parent ), mSearchService( 0 ) - { -- if ( !Nepomuk::Search::QueryServiceClient::serviceAvailable() ) { -- qWarning() << "Nepomuk QueryServer interface not available!"; -- } else { -- mSearchService = new Nepomuk::Search::QueryServiceClient( this ); -- connect( mSearchService, SIGNAL( newEntries( const QList& ) ), -- this, SLOT( hitsAdded( const QList& ) ) ); -- } -+ mSearchService = new Nepomuk::Search::QueryServiceClient( this ); -+ connect( mSearchService, SIGNAL( newEntries( const QList& ) ), -+ this, SLOT( hitsAdded( const QList& ) ) ); - } - - NepomukSearch::~NepomukSearch() -@@ -66,7 +62,10 @@ - return QStringList(); - } - -- mSearchService->blockingQuery( query ); -+ if ( !mSearchService->blockingQuery( query ) ) { -+ qWarning() << Q_FUNC_INFO << "Calling blockingQuery() failed!"; -+ return QStringList(); -+ } - - return mMatchingUIDs.toList(); - } diff --git a/akonadi.spec b/akonadi.spec index 9a78a37..fe51f63 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,8 +1,8 @@ Summary: PIM Storage Service Name: akonadi -Version: 1.2.90 -Release: 3%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -124,6 +124,9 @@ fi %changelog +* Wed Jan 20 2010 Rex Dieter 1.3.0-1 +- akonadi-1.3.0 + * Tue Jan 19 2010 Rex Dieter 1.2.90-3 - Client applications freeze because of hanging Nepomuk search job (kde#219687) diff --git a/sources b/sources index 9a4c096..c0c4c09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81b59bb00888dfe58b79fe38e3d936f8 akonadi-1.2.90.tar.bz2 +45fe59bd301268149cb0313d54a98520 akonadi-1.3.0.tar.bz2