From 47b2ff236568fb0326c06db6d9c5fed763a81409 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 23 2010 22:37:18 +0000 Subject: - akonadi-1.3.60 (20100523 snapshot) --- diff --git a/.cvsignore b/.cvsignore index 4fde055..9e0905f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -akonadi-1.3.1.tar.bz2 +akonadi-20100523svn.tar.bz2 diff --git a/akonadi-1.1.1-mysql_conf.patch b/akonadi-1.1.1-mysql_conf.patch deleted file mode 100644 index 0963a37..0000000 --- a/akonadi-1.1.1-mysql_conf.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up akonadi-1.1.1/server/src/storage/mysql-global.conf.mysql_conf akonadi-1.1.1/server/src/storage/mysql-global.conf ---- akonadi-1.1.1/server/src/storage/mysql-global.conf.mysql_conf 2009-01-21 12:29:03.000000000 -0600 -+++ akonadi-1.1.1/server/src/storage/mysql-global.conf 2009-02-20 11:18:57.000000000 -0600 -@@ -49,6 +49,6 @@ innodb_additional_mem_pool_size=1M - # SELECT sum(data_length) as bla, sum(index_length) as blub FROM information_schema.tables WHERE table_schema not in ("mysql", "information_schema"); - innodb_buffer_pool_size=80M - # size of average write burst, keep Innob_log_waits small, keep Innodb_buffer_pool_wait_free small (see show global status like "inno%", show global variables) --innodb_log_file_size=64M -+innodb_log_file_size=8M - innodb_flush_log_at_trx_commit=2 - diff --git a/akonadi-1.3.1-mysql_update_backport.patch b/akonadi-1.3.1-mysql_update_backport.patch deleted file mode 100644 index f7ad50b..0000000 --- a/akonadi-1.3.1-mysql_update_backport.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: server/src/akonadi.cpp -=================================================================== ---- server/src/akonadi.cpp -+++ server/src/akonadi.cpp 2010-03-22 10:15:12.000000000 +0100 -@@ -368,11 +368,15 @@ - 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; -+ - - // generate config file - const QString globalConfig = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); -@@ -443,6 +447,12 @@ - } - } - -+ // first run, some MySQL versions need a mysql_install_db run for that -+ if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { -+ const QStringList arguments = QStringList() << 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(); -Index: server/src/storage/dbconfig.cpp -=================================================================== ---- server/src/storage/dbconfig.cpp -+++ server/src/storage/dbconfig.cpp 2010-03-22 10:13:08.000000000 +0100 -@@ -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/storage/dbconfig.h -=================================================================== ---- server/src/storage/dbconfig.h -+++ server/src/storage/dbconfig.h 2010-03-22 10:14:28.000000000 +0100 -@@ -76,6 +76,11 @@ - * exists. - */ - QString cleanServerShutdownCommand(); -+ -+ /** -+ * Returns the path where mysql binaries are searched -+ */ -+ QStringList mysqldSearchPath() ; - } - - #endif diff --git a/akonadi-mysql_conf.patch b/akonadi-mysql_conf.patch new file mode 100644 index 0000000..f3479ca --- /dev/null +++ b/akonadi-mysql_conf.patch @@ -0,0 +1,12 @@ +diff -up akonadi/server/src/storage/mysql-global.conf.mysql_conf akonadi/server/src/storage/mysql-global.conf +--- akonadi/server/src/storage/mysql-global.conf.mysql_conf 2010-05-21 05:17:10.000000000 -0500 ++++ akonadi/server/src/storage/mysql-global.conf 2010-05-23 17:14:08.144227600 -0500 +@@ -49,7 +49,7 @@ innodb_additional_mem_pool_size=1M + # SELECT sum(data_length) as bla, sum(index_length) as blub FROM information_schema.tables WHERE table_schema not in ("mysql", "information_schema"); + innodb_buffer_pool_size=80M + # size of average write burst, keep Innob_log_waits small, keep Innodb_buffer_pool_wait_free small (see show global status like "inno%", show global variables) +-innodb_log_file_size=64M ++innodb_log_file_size=8M + innodb_flush_log_at_trx_commit=2 + + # Do not drop the connection to the DB after 8 hours of inactivity diff --git a/akonadi-svn_checkout.sh b/akonadi-svn_checkout.sh new file mode 100755 index 0000000..8189917 --- /dev/null +++ b/akonadi-svn_checkout.sh @@ -0,0 +1,15 @@ +#/bin/sh + +DATE=$(date +%Y%m%d) +EXPORT_DIR=akonadi + +set -x +rm -rf $EXPORT_DIR +# app +svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi $EXPORT_DIR/ + +tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR + +# cleanup +rm -rf $EXPORT_DIR + diff --git a/akonadi.spec b/akonadi.spec index 9741db0..edbda5a 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,24 +1,26 @@ +%define snap 20100523 + Summary: PIM Storage Service Name: akonadi -Version: 1.3.1 -Release: 4%{?dist} +Version: 1.3.60 +Release: 1.%{snap}%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://download.akonadi-project.org/ # Official release -Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 +#Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 +Source0: akonadi-%{snap}svn.tar.bz2 +Source1: akonadi-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # shrink default initial db size a bit (approx 140mb->28mb) -%define mysql_conf_timestamp 20100209 -Patch1: akonadi-1.1.1-mysql_conf.patch +%define mysql_conf_timestamp 20100523 +Patch1: akonadi-mysql_conf.patch ## upstream patches # backport from trunk/ -# -Patch100: akonadi-1.3.1-mysql_update_backport.patch BuildRequires: cmake >= 2.6.0 BuildRequires: qt4-devel >= 4.4 @@ -29,6 +31,9 @@ BuildRequires: mysql-server BuildRequires: libxslt BuildRequires: shared-mime-info BuildRequires: boost-devel +%if 0%{?fedora} > 13 +BuildRequires: sqlite-devel >= 2.6.23 +%endif BuildRequires: soprano-devel %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -57,16 +62,13 @@ Requires: pkgconfig %prep -%setup -q -n akonadi-%{version}%{?alphatag} +%setup -q -n akonadi%{!?snap:-%{version}} %patch1 -p1 -b .mysql_conf touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf -%patch100 -p0 -b .mysql_update_backport - %build - mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} \ @@ -78,16 +80,21 @@ make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} +rm -rf %{buildroot} +make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents +mkdir -p %{buildroot}%{_datadir}/akonadi/agents -touch -d %{mysql_conf_timestamp} $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf +touch -d %{mysql_conf_timestamp} %{buildroot}%{_sysconfdir}/akonadi/mysql-local.conf + + +%check +export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig +test "$(pkg-config --modversion akonadi)" = "%{version}" %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -109,6 +116,7 @@ fi %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf %config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf %{_bindir}/akonadi_control +%{_bindir}/akonadi_rds %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.1* @@ -126,6 +134,9 @@ fi %changelog +* Sun May 23 2010 Rex Dieter 1.3.60-1.20100523 +- akonadi-1.3.60 (20100523 snapshot) + * Tue Mar 30 2010 Rex Dieter 1.3.1-4 - fix typo on qt4 dep diff --git a/sources b/sources index 1ef5f49..06ee9ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6eef3ed5c28d55f4b6530544e379413 akonadi-1.3.1.tar.bz2 +cc4ec9f710cff374120ec36bdad9604b akonadi-20100523svn.tar.bz2