[telepathy-qt4] (Build)Requires: compat-telepathy-farstream-devel (f18+)

Rex Dieter rdieter at fedoraproject.org
Tue Oct 9 17:00:55 UTC 2012


commit 00dc96b51eca97134c94dee34d065b3e7cc551cd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 9 12:01:14 2012 -0500

    (Build)Requires: compat-telepathy-farstream-devel (f18+)

 telepathy-qt4.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/telepathy-qt4.spec b/telepathy-qt4.spec
index 100972e..15f560d 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -1,7 +1,7 @@
 
 Name:    telepathy-qt4
 Version: 0.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: High-level bindings for Telepathy
 
 License: LGPLv2+
@@ -21,8 +21,11 @@ BuildRequires: pkgconfig(QtDBus) pkgconfig(QtNetwork) pkgconfig(QtXml)
 BuildRequires: pkgconfig(telepathy-farstream)
 BuildRequires: pkgconfig(farstream-0.1)
 %endif
-## unit tests
 %if 0%{?fedora} > 17
+## make sure to get the *right* telepathy-farstream
+BuildConflicts: telepathy-farstream-devel >= 0.6.0
+BuildRequires: compat-telepathy-farstream-devel
+## unit tests
 %define enable_tests -DENABLE_TESTS:BOOL=ON
 BuildRequires: pkgconfig(telepathy-glib) >= 0.19
 BuildRequires: pkgconfig(gio-2.0)
@@ -46,6 +49,10 @@ Requires: %{name}-farstream%{?_isa} = %{version}-%{release}
 Obsoletes: telepathy-qt4-farstream-devel < 0.9.1-2
 Provides:  telepathy-qt4-farstream-devel = %{version}-%{release} 
 Provides:  telepathy-qt-farstream-devel = %{version}-%{release}
+%if 0%{?fedora} > 17
+## make sure to get the *right* telepathy-farstream deps
+Requires: compat-telepathy-farstream-devel%{?_isa}
+%endif
 %endif
 %description devel
 %{summary}.
@@ -112,6 +119,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue Oct 09 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-3
+- (Build)Requires: compat-telepathy-farstream-devel (f18+)
+
 * Fri Oct 05 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-2
 - rebuild (farstream)
 


More information about the scm-commits mailing list