diff --git a/akonadi.spec b/akonadi.spec index 9a6b715..fc2f954 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -2,10 +2,16 @@ # base pkg default to SQLITE now, install -mysql if you want that instead %global database_backend SQLITE +# mysql package name +%global mysql mysql +%if 0%{?fedora} > 18 +%global mysql mariadb +%endif + Summary: PIM Storage Service Name: akonadi Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -40,7 +46,7 @@ BuildRequires: pkgconfig(sqlite3) >= 3.6.23 BuildRequires: dbus-x11 xorg-x11-server-Xvfb # backends, used at buildtime to query known locations of server binaries # FIXME/TODO: set these via cmake directives, avoids needless buildroot items -BuildRequires: mysql-server +BuildRequires: %{mysql}-server BuildRequires: postgresql-server %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -57,19 +63,19 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{summary}. %package mysql -Summary: Akonadi MySQL backend support +Summary: Akonadi %{mysql} backend support # upgrade path Obsoletes: akonadi < 1.7.90-2 Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: mysql-server +Requires: %{mysql}-server Requires: qt4-mysql%{?_isa} Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives %description mysql -Configures akonadi to use mysql backend by default. +Configures akonadi to use %{mysql} backend by default. -Requires an available instance of mysql server at runtime. -Akonadi can spawn a per-user one automatically if the mysql-server +Requires an available instance of 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 @@ -93,7 +99,6 @@ 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 @@ -123,17 +128,13 @@ install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akona %check -export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig +export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig test "$(pkg-config --modversion akonadi)" = "%{version}" # this one (still) fails in mock (local build ok): # 14/14 Test #14: akonadi-dbconfigtest xvfb-run -a dbus-launch --exit-with-session make test -C %{_target_platform} ||: -%clean -rm -rf %{buildroot} - - %post -p /sbin/ldconfig %posttrans @@ -194,6 +195,9 @@ fi %changelog +* Mon Mar 11 2013 Rex Dieter 1.9.1-2 +- s/mysql/mariadb/ in dependencies for f19+ + * Sat Mar 02 2013 Rex Dieter 1.9.1-1 - 1.9.1