[akonadi] - akonadi-1.4.54-20101120 snapshot

[Rex Dieter]

commit 85088d4eab021fdc7e8ce552864e40e99ab427ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 20 18:51:30 2010 -0600

    - akonadi-1.4.54-20101120 snapshot

 .gitignore                                         |    2 +-
 ...server-1.4.0-remove-sqlite-version-assert.patch |   11 -------
 akonadi-svn_checkout.sh                            |   15 ---------
 akonadi.spec                                       |   31 ++++++++-----------
 sources                                            |    2 +-
 5 files changed, 15 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 750cd48..a99b2e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/akonadi-1.4.1.tar.bz2
+/akonadi-1.4.54-20101120.tar.bz2
diff --git a/akonadi.spec b/akonadi.spec
index 3de8093..54f21c3 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,32 +1,28 @@
 
-%if 0%{?fedora} > 13
-%global sqlite 1
-%endif
+%define snap 20101120
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.4.54
+Release: 1.%{snap}%{?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 20101120
 # shrink default initial db size a bit (approx 140mb->28mb)
 Patch1: akonadi-mysql_conf.patch
 
-## upstream patches
-Patch100: akonadi-server-1.4.0-remove-sqlite-version-assert.patch
-
 ## backport from trunk/
 
 BuildRequires: cmake >= 2.6.0
@@ -39,9 +35,7 @@ BuildRequires: libxslt
 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}}
@@ -70,15 +64,13 @@ Requires: pkgconfig
 
 
 %prep
-%setup -q -n akonadi%{!?snap:-%{version}}
+%setup -q -n akonadi-%{version}
 
 %if 0%{?fedora} < 15
 %patch1 -p1 -b .mysql_conf
 %endif
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
-%patch100 -p1 -b .remove-sqlite-version-assert
-
 
 %build
 mkdir -p %{_target_platform}
@@ -134,6 +126,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
@@ -144,9 +138,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,-)
@@ -157,6 +149,9 @@ fi
 
 
 %changelog
+* Sat Nov 20 2010 Rex Dieter <rdieter at fedoraproject.org> 1.4.54-1.20101120
+- akonadi-1.4.54-20101120 snapshot
+
 * Fri Oct 22 2010 Rex Dieter <rdieter at fedoraproject.org> 1.4.1-2
 - patch out (paranoid) assert
 
diff --git a/sources b/sources
index d184e6e..868a642 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0852fd5f45aa602b09824cf51e24fbd  akonadi-1.4.1.tar.bz2
+8d6c649c2b0640eb10cd04e370499d3d  akonadi-1.4.54-20101120.tar.bz2