From f7d1c5a4d63979ac0d307162dfa524e2764eb097 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 13 2011 15:04:42 +0000 Subject: switch back to mysql backend default pkgconfig-style deps own/ghost /etc/xdg/akonadi/akonadiserverrc --- diff --git a/akonadi.spec b/akonadi.spec index 33a5cd6..c917e8c 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,11 +1,11 @@ ## Can be either MYSQL(uptsream default), SQLITE, or POSTGRES(untested) -%global database_backend SQLITE +%global database_backend MYSQL Summary: PIM Storage Service Name: akonadi Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -29,10 +29,10 @@ BuildRequires: mysql-devel BuildRequires: mysql-server # for xsltproc BuildRequires: libxslt -BuildRequires: qt4-devel -BuildRequires: shared-mime-info -BuildRequires: soprano-devel -BuildRequires: sqlite-devel >= 3.6.23 +BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml) +BuildRequires: pkgconfig(shared-mime-info) +BuildRequires: pkgconfig(soprano) +BuildRequires: pkgconfig(sqlite3) >= 3.6.23 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -100,6 +100,10 @@ touch -d %{mysql_conf_timestamp} \ # create/own %{_libdir}/akondi mkdir -p %{buildroot}%{_libdir}/akonadi +# %%ghost'd global akonadiserverrc +touch akonadiserverrc +install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc + %check make test -C %{_target_platform} @@ -126,6 +130,8 @@ fi %files %defattr(-,root,root,-) %doc AUTHORS lgpl-license +%dir %{_sysconfdir}/xdg/akonadi/ +%ghost %config(missingok,noreplace) %{_sysconfdir}/xdg/akonadi/akonadiserverrc %dir %{_sysconfdir}/akonadi/ # example conf's %{_sysconfdir}/akonadi/mysql-global-big.conf @@ -155,6 +161,11 @@ fi %changelog +* Thu Oct 13 2011 Rex Dieter 1.6.2-2 +- switch back to mysql backend default +- pkgconfig-style deps +- own/ghost /etc/xdg/akonadi/akonadiserverrc + * Tue Oct 04 2011 Rex Dieter 1.6.2-1 - 1.6.2