From 33349bf0e99f2decdb0b0af6c528c921d8ed9ab5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 14 2011 13:09:14 +0000 Subject: Merge remote-tracking branch 'origin/master' into f14 Conflicts: .gitignore akonadi.spec sources --- diff --git a/.gitignore b/.gitignore index ff5b724..07f2c6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/akonadi-1.4.1.tar.bz2 -/akonadi-1.4.3.tar.bz2 +/akonadi-1.5.1.tar.bz2 diff --git a/akonadi-svn_checkout.sh b/akonadi-svn_checkout.sh deleted file mode 100755 index 8189917..0000000 --- a/akonadi-svn_checkout.sh +++ /dev/null @@ -1,15 +0,0 @@ -#/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 978dfe3..43df886 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,52 +1,43 @@ -%if 0%{?fedora} > 13 -%global sqlite 1 -%endif - Summary: PIM Storage Service Name: akonadi -Version: 1.4.3 +Version: 1.5.1 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://download.akonadi-project.org/ %if 0%{?snap} -Source0: akonadi-%{snap}svn.tar.bz2 -Source1: akonadi-svn_checkout.sh +# git clone git://git.kde.org/akonadi +# git archive --prefix=akonadi-%{version}/ master | bzip2 > akonadi-%{version}-%{snap}.tar.bz2 +Source0: akonadi-%{version}-%{snap}.tar.bz2 %else # Official release Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define mysql_conf_timestamp 20100625 +%define mysql_conf_timestamp 20110211 # shrink default initial db size a bit (approx 140mb->28mb) Patch1: akonadi-mysql_conf.patch -## upstream patches - -## backport from trunk/ - -BuildRequires: cmake >= 2.6.0 -BuildRequires: qt4-devel >= 4.4 BuildRequires: automoc4 +BuildRequires: boost-devel +BuildRequires: cmake >= 2.6.0 BuildRequires: mysql-devel BuildRequires: mysql-server # for xsltproc BuildRequires: libxslt +BuildRequires: qt4-devel BuildRequires: shared-mime-info -BuildRequires: boost-devel BuildRequires: soprano-devel -%if 0%{?sqlite} BuildRequires: sqlite-devel >= 3.6.23 -%endif - %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} + # when/if akonadi grows support for other backends, consider splitting # these similar to how phonon is done currently. -Requires: qt4-mysql +Requires: qt4-mysql%{?_isa} # not *strictly* required, but we need a functional default configuration Requires: mysql-server Requires(postun): /sbin/ldconfig @@ -69,9 +60,9 @@ Requires: pkgconfig %prep -%setup -q -n akonadi%{!?snap:-%{version}} +%setup -q -n akonadi-%{version} -%if 0%{?fedora} < 15 +%if 0%{?fedora} < 16 %patch1 -p1 -b .mysql_conf %endif touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf @@ -101,11 +92,7 @@ mkdir -p %{buildroot}%{_libdir}/akonadi %check -## expected failures: -#The following tests FAILED: -# 2 - akonadi-imapparserbenchmark (Failed) -# 3 - akonadidb-xmllint (Failed) -make test -C %{_target_platform} ||: +make test -C %{_target_platform} export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig test "$(pkg-config --modversion akonadi)" = "%{version}" @@ -133,6 +120,8 @@ fi %config(noreplace) %{_sysconfdir}/akonadi/mysql-global-mobile.conf %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf %config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf +%{_bindir}/akonadi_agent_launcher +%{_bindir}/akonadi_agent_server %{_bindir}/akonadi_control %{_bindir}/akonadi_rds %{_bindir}/akonadictl @@ -143,9 +132,7 @@ fi %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service %{_datadir}/mime/packages/akonadi-mime.xml %{_datadir}/akonadi/ -%if 0%{?sqlite} %{_qt4_plugindir}/sqldrivers/libqsqlite3.so -%endif %files devel %defattr(-,root,root,-) @@ -156,8 +143,39 @@ fi %changelog -* Fri Jan 07 2011 1.4.3-1 -- akonadi-1.4.3 +* Mon Mar 14 2011 Rex Dieter 1.5.1-1 +- akonadi-1.5.1 + +* Tue Feb 15 2011 Rex Dieter 1.5.0-4 +- arch'ify qt4-mysql dep + +* Fri Feb 11 2011 Rex Dieter 1.5.0-3.1 +- shrinky-dink db on f15 too + +* Mon Feb 07 2011 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Feb 06 2011 Rex Dieter 1.5.0-2 +- rebuild (boost) + +* Sat Jan 22 2011 Rex Dieter 1.5.0-1 +- akonadi-1.5.0 + +* Fri Jan 07 2011 Rex Dieter 1.4.95-1 +- akonadi-1.4.95 + +* Fri Jan 07 2011 - 1.4.90-2 +- rebuild (mysql) +- %%check: make test should pass 100% now + +* Tue Dec 21 2010 Rex Dieter - 1.4.90-1 +- akonadi-1.4.90 + +* Sun Nov 21 2010 Rex Dieter - 1.4.80-1 +- akonadi-1.4.80 + +* Sat Nov 20 2010 Rex Dieter 1.4.54-1.20101120 +- akonadi-1.4.54-20101120 snapshot * Fri Oct 22 2010 Rex Dieter 1.4.1-2 - patch out (paranoid) assert diff --git a/sources b/sources index 5db30ec..e0e5340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffe61aca65dffded578bd6fae8aba6bd akonadi-1.4.3.tar.bz2 +4225b064cac6553c22cbeca9a8f93c25 akonadi-1.5.1.tar.bz2