rpms/akonadi/devel akonadi-mysql_conf.patch, NONE, 1.1 akonadi-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.20, 1.21 akonadi.spec, 1.59, 1.60 sources, 1.21, 1.22 akonadi-1.1.1-mysql_conf.patch, 1.1, NONE akonadi-1.3.1-mysql_update_backport.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Sun May 23 22:37:18 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30158
Modified Files:
.cvsignore akonadi.spec sources
Added Files:
akonadi-mysql_conf.patch akonadi-svn_checkout.sh
Removed Files:
akonadi-1.1.1-mysql_conf.patch
akonadi-1.3.1-mysql_update_backport.patch
Log Message:
* Sun May 23 2010 Rex Dieter <rdieter at fedoraproject.org> 1.3.60-1.20100523
- akonadi-1.3.60 (20100523 snapshot)
akonadi-mysql_conf.patch:
mysql-global.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE akonadi-mysql_conf.patch ---
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
--- NEW FILE akonadi-svn_checkout.sh ---
#/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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 9 Feb 2010 11:44:00 -0000 1.20
+++ .cvsignore 23 May 2010 22:37:17 -0000 1.21
@@ -1 +1 @@
-akonadi-1.3.1.tar.bz2
+akonadi-20100523svn.tar.bz2
Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- akonadi.spec 30 Mar 2010 18:24:24 -0000 1.59
+++ akonadi.spec 23 May 2010 22:37:18 -0000 1.60
@@ -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_platfo
%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 <rdieter at fedoraproject.org> 1.3.60-1.20100523
+- akonadi-1.3.60 (20100523 snapshot)
+
* Tue Mar 30 2010 Rex Dieter <rdieter at fedoraproject.org> 1.3.1-4
- fix typo on qt4 dep
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 9 Feb 2010 11:44:00 -0000 1.21
+++ sources 23 May 2010 22:37:18 -0000 1.22
@@ -1 +1 @@
-e6eef3ed5c28d55f4b6530544e379413 akonadi-1.3.1.tar.bz2
+cc4ec9f710cff374120ec36bdad9604b akonadi-20100523svn.tar.bz2
--- akonadi-1.1.1-mysql_conf.patch DELETED ---
--- akonadi-1.3.1-mysql_update_backport.patch DELETED ---
More information about the scm-commits
mailing list