Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Mon Jul 19 15:06:37 CEST 2010. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2010-06-15 14:08:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2010-07-16 18:20:22.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 16 18:19:35 CEST 2010 - dmueller@suse.de + +- update to 1.3.90 (1.4.0 RC1): + - Reset RIDs on inter-resource moves. + - Optimize disk space usage with internal MySQL. + - Improve error reporting of the Akonadi remote debugging server. + - Fix moving collections into the collection root. + - Report PostgreSQL database errors in english independent of locale settings. + - Fix unicode collection name encoding. + - Optimize cache pruning with filesystem payload store. + - Fix automatic migration between database and filesystem payload store. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 1_3_BRANCH.diff akonadi-1.3.1.tar.bz2 r1094139-akonadi_mysql_dont_drop_connections.diff New: ---- 1_4_BRANCH.diff akonadi-1.3.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.pSWcEd/_old 2010-07-19 15:05:22.000000000 +0200 +++ /var/tmp/diff_new_pack.pSWcEd/_new 2010-07-19 15:05:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package akonadi-runtime (Version 1.3.1) +# spec file for package akonadi-runtime (Version 1.3.90) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -Version: 1.3.1 -Release: 3 +Version: 1.3.90 +Release: 1 %define rversion %version License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,8 +34,7 @@ # http://download.akonadi-project.org Source0: akonadi-%rversion.tar.bz2 Source1: akonadi-runtime-rpmlintrc -Patch0: r1094139-akonadi_mysql_dont_drop_connections.diff -Patch1: 1_3_BRANCH.diff +Patch0: 1_4_BRANCH.diff %if %suse_version > 1010 Requires: libqt4 >= %(rpm -q --queryformat '%{VERSION}' libqt4) %else @@ -107,7 +106,6 @@ %prep %setup -q -n akonadi-%version %patch0 -%patch1 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc @@ -135,9 +133,11 @@ %defattr(-,root,root) /usr/bin/akonadi_control /usr/bin/akonadictl +/usr/bin/akonadi_rds /usr/bin/akonadiserver %dir /etc/akonadi %config /etc/akonadi/mysql-global.conf +%config /etc/akonadi/mysql-global-mobile.conf %_libdir/libakonadiprivate.so.1* /usr/share/mime/packages/akonadi-mime.xml /usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service @@ -147,6 +147,10 @@ %dir /usr/include/akonadi %dir %_libdir/cmake %_libdir/cmake/Akonadi +%if %suse_version > 1120 +%dir %_libdir/qt4/plugins/sqldrivers +%_libdir/qt4/plugins/sqldrivers/libqsqlite3.so +%endif /usr/include/akonadi/private /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %_libdir/libakonadiprotocolinternals.so ++++++ 1_3_BRANCH.diff -> 1_4_BRANCH.diff ++++++ --- KDE/akonadi-runtime/1_3_BRANCH.diff 2010-06-15 14:08:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/akonadi-runtime/1_4_BRANCH.diff 2010-07-16 19:09:06.000000000 +0200 @@ -1,86 +1,7 @@ -Index: server/src/storage/dbconfig.h -=================================================================== ---- server/src/storage/dbconfig.h (.../tags/akonadi/1.3.1) (revision 1138050) -+++ server/src/storage/dbconfig.h (.../branches/akonadi/1.3) (revision 1138050) -@@ -76,6 +76,12 @@ - * exists. - */ - QString cleanServerShutdownCommand(); -+ -+ /** -+ * Returns the path where mysql binaries are searched -+ */ -+ QStringList mysqldSearchPath() ; -+ - } - - #endif -Index: server/src/storage/dbconfig.cpp -=================================================================== ---- server/src/storage/dbconfig.cpp (.../tags/akonadi/1.3.1) (revision 1138050) -+++ server/src/storage/dbconfig.cpp (.../branches/akonadi/1.3) (revision 1138050) -@@ -299,3 +299,15 @@ - return sInstance()->mCleanServerShutdownCommand; - } - -+QStringList DbConfig::mysqldSearchPath() -+{ -+const QStringList mysqldSearchPath = QStringList() -+ << QLatin1String("/usr/sbin") -+ << QLatin1String("/usr/local/sbin") -+ << QLatin1String("/usr/local/libexec") -+ << QLatin1String("/usr/libexec") -+ << QLatin1String("/opt/mysql/libexec") -+ << QLatin1String("/opt/local/lib/mysql5/bin"); -+ -+ return mysqldSearchPath ; -+} -Index: server/src/akonadi.cpp -=================================================================== ---- server/src/akonadi.cpp (.../tags/akonadi/1.3.1) (revision 1138050) -+++ server/src/akonadi.cpp (.../branches/akonadi/1.3) (revision 1138050) -@@ -368,12 +368,18 @@ - void AkonadiServer::startMysqlDatabaseProcess() - { - const QString mysqldPath = DbConfig::serverPath(); -+ const QStringList mysqldSearchPath = DbConfig::mysqldSearchPath(); - - const QString dataDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_data" ) ); - const QString akDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/" ) ); - const QString miscDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ); - const QString fileDataDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/file_db_data" ) ); -+ const QString mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_install_db" ), mysqldSearchPath ); -+ akDebug() << "Found mysql_install_db: " << mMysqlInstallDbPath; -+ const QString mMysqlUpgradeDBPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_upgrade" ), mysqldSearchPath ); -+ akDebug() << "Found mysql_upgrade: " << mMysqlUpgradeDBPath; - -+ - // generate config file - const QString globalConfig = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); - const QString localConfig = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-local.conf" ) ); -@@ -443,6 +449,13 @@ - } - } - -+ // first run, some MySQL versions need a mysql_install_db run for that -+ const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String("akonadi/mysql-global.conf" )); -+ if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { -+ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); -+ QProcess::execute( mMysqlInstallDbPath, arguments ); -+ } -+ - // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate - if ( confUpdate ) { - QFile(dataDir + QDir::separator() + QString::fromLatin1( "ib_logfile0" )).remove(); -@@ -464,6 +477,11 @@ - akFatal() << "process error:" << mDatabaseProcess->errorString(); - } - -+ if ( !mMysqlUpgradeDBPath.isEmpty() ) { -+ const QStringList arguments = QStringList() << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); -+ QProcess::execute( mMysqlUpgradeDBPath, arguments ); -+ } -+ - const QLatin1String initCon( "initConnection" ); - { - QSqlDatabase db = QSqlDatabase::addDatabase( DbConfig::driverName(), initCon ); +package: kdelibs-4.4.3.tar.bz2 +kdemod: kdelibs +--- BRANCH_STATUS ++++ BRANCH_STATUS +@@ -0,0 +1,2 @@ ++current HEAD: 1127686 ++svn di between //tags/KDE/4.4.3/kdelibs and //branches/KDE/4.4/kdelibs ++++++ akonadi-1.3.1.tar.bz2 -> akonadi-1.3.90.tar.bz2 ++++++ ++++ 14643 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org