|
|
@@ -3,11 +3,14 @@
|
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
|
|
|
%define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
|
|
|
|
|
|
+## Can be either MYSQL(uptsream default), SQLITE, or POSTGRES(untested)
|
|
|
+%global database_backend SQLITE
|
|
|
+
|
|
|
Name: akonadi
|
|
|
Summary: PIM Storage Service
|
|
|
Summary(ja): PIM ストレージサービス
|
|
|
-Version: 1.5.0
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 1.6.0
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Libraries
|
|
|
License: LGPLv2+
|
|
|
@@ -15,7 +18,7 @@ URL: http://download.akonadi-project.org/
|
|
|
|
|
|
Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
|
|
|
|
|
|
-%define mysql_conf_timestamp 20110107
|
|
|
+%define mysql_conf_timestamp 20110629
|
|
|
# shrink default initial db size a bit (approx 140mb->28mb)
|
|
|
Patch1: akonadi-mysql_conf.patch
|
|
|
|
|
|
@@ -35,29 +38,27 @@ BuildRequires: soprano-devel >= 2.5.0
|
|
|
BuildRequires: sqlite3-devel
|
|
|
BuildRequires: libICE-devel libXext-devel
|
|
|
|
|
|
-# when/if akonadi grows support for other backends, consider splitting
|
|
|
-# these similar to how phonon is done currently.
|
|
|
+Requires: qt4 = %{_qt4_version}
|
|
|
+
|
|
|
+%if "%{?database_backend}" == "MYSQL"
|
|
|
Requires: qt4-MySQL
|
|
|
# not *strictly* required, but we need a functional default configuration
|
|
|
-#Requires: MySQL-server
|
|
|
+Requires: MySQL-server
|
|
|
+%endif
|
|
|
+
|
|
|
+Obsoletes: akonadi-sqlite < %{version}-%{release}
|
|
|
+
|
|
|
Requires(post): /sbin/ldconfig
|
|
|
Requires(postun): /sbin/ldconfig
|
|
|
|
|
|
%description
|
|
|
%{summary}.
|
|
|
+%if "%{?database_backend}" == "MYSQL"
|
|
|
Requires an available instance of mysql server at runtime.
|
|
|
Akonadi can spawn a per-user one automatically if the mysql-server
|
|
|
package is installed on the machine.
|
|
|
See also: %{_sysconfdir}/akonadi/mysql-global.conf
|
|
|
-
|
|
|
-%package sqlite
|
|
|
-Summary: a sliglty adjusted QSQLITE driver for akonadi
|
|
|
-Group: System Environment/Libraries
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
-Requires: qt4 = %{_qt4_version}
|
|
|
-
|
|
|
-%description sqlite
|
|
|
-%{summary}.
|
|
|
+%endif
|
|
|
|
|
|
%package devel
|
|
|
Summary: Developer files for %{name}
|
|
|
@@ -72,8 +73,8 @@ Requires: qt4-devel
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch1 -p1 -b .mysql_conf
|
|
|
-touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
|
|
|
+#%patch1 -p1 -b .mysql_conf
|
|
|
+#touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
|
|
|
|
|
|
%build
|
|
|
%ifarch x86_64
|
|
|
@@ -85,6 +86,7 @@ pushd %{_target_platform}
|
|
|
%cmake \
|
|
|
-DCONFIG_INSTALL_DIR=%{_sysconfdir} \
|
|
|
-DINSTALL_QSQLITE_IN_QT_PREFIX:PATH=%{_qt4_plugindir} \
|
|
|
+ %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
|
|
|
..
|
|
|
popd
|
|
|
|
|
|
@@ -97,7 +99,27 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents
|
|
|
|
|
|
-touch -d %{mysql_conf_timestamp} $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf
|
|
|
+# create "big" config (analog to -mobile.conf)
|
|
|
+install -p \
|
|
|
+ $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global.conf \
|
|
|
+ $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global-big.conf
|
|
|
+
|
|
|
+# default to small/mobile config
|
|
|
+install -p \
|
|
|
+ $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global-mobile.conf \
|
|
|
+ $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global.conf
|
|
|
+
|
|
|
+touch -d %{mysql_conf_timestamp} \
|
|
|
+ $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global*.conf \
|
|
|
+ $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf
|
|
|
+
|
|
|
+# create/own %{_libdir}/akondi
|
|
|
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/akonadi
|
|
|
+
|
|
|
+#%check
|
|
|
+#make test -C %{_target_platform}
|
|
|
+#export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_datadir}/pkgconfig:$RPM_BUILD_ROOT%{_libdir}/pkgconfig
|
|
|
+#test "$(pkg-config --modversion akonadi)" = "%{version}"
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -118,8 +140,10 @@ fi
|
|
|
%defattr(-,root,root,-)
|
|
|
%doc AUTHORS lgpl-license
|
|
|
%dir %{_sysconfdir}/akonadi
|
|
|
+# example conf's
|
|
|
+%{_sysconfdir}/akonadi/mysql-global-big.conf
|
|
|
+%{_sysconfdir}/akonadi/mysql-global-mobile.conf
|
|
|
%config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf
|
|
|
-%config(noreplace) %{_sysconfdir}/akonadi/mysql-global-mobile.conf
|
|
|
%config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf
|
|
|
%{_bindir}/akonadi_agent_launcher
|
|
|
%{_bindir}/akonadi_agent_server
|
|
|
@@ -132,9 +156,6 @@ fi
|
|
|
%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
|
|
|
%{_datadir}/mime/packages/akonadi-mime.xml
|
|
|
%{_datadir}/akonadi
|
|
|
-
|
|
|
-%files sqlite
|
|
|
-%defattr(-,root,root,-)
|
|
|
%{_qt4_plugindir}/sqldrivers/libqsqlite3.so
|
|
|
|
|
|
%files devel
|
|
|
@@ -146,6 +167,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
* Thu Mar 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.5.0-2
|
|
|
- rebuilt with qt4-4.7.2
|
|
|
|
inagaki