[akonadi] BR: +postgresql-server, -mysql-devel devel: drop explicit BR: qt4-devel, pulled in via auto-pkgconfi

Rex Dieter rdieter at fedoraproject.org
Wed Jan 11 15:33:37 UTC 2012


commit e80056ceb9c0532ed2cc031f5efad823c40c27ae
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 11 09:33:39 2012 -0600

    BR: +postgresql-server, -mysql-devel
    devel: drop explicit BR: qt4-devel, pulled in via auto-pkgconfig deps

 akonadi.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/akonadi.spec b/akonadi.spec
index 179bf77..bf34fea 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -9,7 +9,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.6.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -29,8 +29,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automoc4
 BuildRequires: boost-devel
 BuildRequires: cmake >= 2.6.0
-BuildRequires: mysql-devel
-BuildRequires: mysql-server
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml)
@@ -39,6 +37,10 @@ BuildRequires: pkgconfig(soprano)
 BuildRequires: pkgconfig(sqlite3) >= 3.6.23
 # %%check
 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: postgresql-server
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
@@ -62,7 +64,6 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf
 Summary: Developer files for %{name}
 Group:   Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: qt4-devel
 %description devel
 %{summary}.
 
@@ -170,6 +171,10 @@ fi
 
 
 %changelog
+* Wed Jan 11 2012 Rex Dieter <rdieter at fedoraproject.org> 1.6.90-3
+- BR: +postgresql-server, -mysql-devel
+- -devel: drop explicit BR: qt4-devel, pulled in via auto-pkgconfig deps
+
 * Sat Dec 31 2011 Rex Dieter <rdieter at fedoraproject.org> 1.6.90-2
 - %%check: try harder to make work in mock (using xvfb)
 - default to sqlite on 'small' platforms (arm)


More information about the scm-commits mailing list