[akonadi] 1.12.1-2

[Rex Dieter]

commit 215b266c1a150600c32144e5e84e21cda84b2834
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Apr 15 08:44:48 2014 -0500

    1.12.1-2
    
    - drop mysql-global-mobile.conf, it's too minimalistic
    - drop Requires: qt4 >= 4.8.5-10 (workaround for psql driver bug had only a small window a long time ago)

 akonadi.spec |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/akonadi.spec b/akonadi.spec
index c61c5ed..95bcf26 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -14,7 +14,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
@@ -34,7 +34,7 @@ Source10: akonadiserverrc.mysql
 
 ## upstream patches
 
-%define mysql_conf_timestamp 20130607
+%define mysql_conf_timestamp 20140415
 
 BuildRequires: automoc4
 BuildRequires: boost-devel
@@ -52,8 +52,7 @@ BuildRequires: dbus-x11 xorg-x11-server-Xvfb
 BuildRequires: mysql-server
 BuildRequires: postgresql-server
 
-#%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
-Requires: qt4%{?_isa} >= 4.8.5-10
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 Requires(postun): /sbin/ldconfig
 
@@ -103,23 +102,12 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot} 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql
 
 mkdir -p %{buildroot}%{_datadir}/akonadi/agents
 
-# create "big" config (analog to -mobile.conf)
-install -p \
-  %{buildroot}%{_sysconfdir}/akonadi/mysql-global.conf \
-  %{buildroot}%{_sysconfdir}/akonadi/mysql-global-big.conf
-
-# default to small/mobile config
-install -p \
-  %{buildroot}%{_sysconfdir}/akonadi/mysql-global-mobile.conf \
-  %{buildroot}%{_sysconfdir}/akonadi/mysql-global.conf
-
 touch -d %{mysql_conf_timestamp} \
   %{buildroot}%{_sysconfdir}/akonadi/mysql-global*.conf \
   %{buildroot}%{_sysconfdir}/akonadi/mysql-local.conf
@@ -131,6 +119,10 @@ mkdir -p %{buildroot}%{_libdir}/akonadi
 touch akonadiserverrc 
 install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc
 
+## unpackaged files
+# omit mysql-global-mobile.conf
+rm -fv %{buildroot}%{_sysconfdir}/akonadi/mysql-global-mobile.conf
+
 
 %check
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
@@ -195,12 +187,13 @@ fi
 %config(noreplace) %{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf
-# example conf's
-%{_sysconfdir}/akonadi/mysql-global-big.conf
-%{_sysconfdir}/akonadi/mysql-global-mobile.conf
 
 
 %changelog
+* Tue Apr 15 2014 Rex Dieter <rdieter at fedoraproject.org> 1.12.1-2
+- drop mysql-global-mobile.conf, it's too minimalistic
+- drop Requires: qt4 >= 4.8.5-10 (workaround for psql driver bug had only a small window a long time ago)
+
 * Tue Apr 08 2014 Rex Dieter <rdieter at fedoraproject.org> 1.12.1-1
 - 1.12.1