[telepathy-qt4] telepathy-qt-0.9.3

Rex Dieter rdieter at fedoraproject.org
Mon Jul 16 18:59:29 UTC 2012


commit 6b4505968781070a4308259717d507bc47eaf195
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 16 14:02:53 2012 -0500

    telepathy-qt-0.9.3

 .gitignore         |    1 +
 sources            |    2 +-
 telepathy-qt4.spec |   26 +++++++++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6d2075..f2aa744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /telepathy-qt-0.9.2.tar.gz
+/telepathy-qt-0.9.3.tar.gz
diff --git a/sources b/sources
index 8056232..f60fdde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e49df0c6d19bbac622209d0f87f0d1b2  telepathy-qt-0.9.2.tar.gz
+94ac93aedf5f6fff49837bc8368e5a37  telepathy-qt-0.9.3.tar.gz
diff --git a/telepathy-qt4.spec b/telepathy-qt4.spec
index 551e522..096c143 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -1,5 +1,10 @@
+
+%if 0%{?fedora} > 17
+%define enable_tests -DENABLE_TESTS:BOOL=ON
+%endif
+
 Name:    telepathy-qt4
-Version: 0.9.2
+Version: 0.9.3
 Release: 1%{?dist}
 Summary: High-level bindings for Telepathy
 
@@ -18,13 +23,16 @@ BuildRequires: pkgconfig(QtDBus) pkgconfig(QtNetwork) pkgconfig(QtXml)
 %if 0%{?fedora} > 16 || 0%{?rhel} >= 7
 %define farstream 1
 BuildRequires: pkgconfig(telepathy-farstream)
-# unit tests
-BuildRequires: pkgconfig(telepathy-glib) >= 0.17.2
-BuildRequires: pkgconfig(gio-2.0)
 %else
 %define farsight 1
 BuildRequires: pkgconfig(telepathy-farsight)
 %endif
+# unit tests
+%if 0%{?enable_tests:1}
+BuildRequires: pkgconfig(telepathy-glib) >= 0.19
+BuildRequires: pkgconfig(gio-2.0)
+%endif
+
 
 Requires: telepathy-mission-control
 
@@ -49,7 +57,6 @@ Obsoletes: telepathy-qt4-farstream-devel < 0.9.1-2
 Provides:  telepathy-qt4-farstream-devel = %{version}-%{release} 
 Provides:  telepathy-qt-farstream-devel = %{version}-%{release}
 %endif
-
 %description devel
 %{summary}.
 
@@ -77,10 +84,12 @@ Provides:  telepathy-qt-farstream = %{version}-%{release}
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} \
+  %{?enable_tests}%{!?enable_tests:-DENABLE_TESTS:BOOL=OFF} \
+  ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} -k
 
 
 %install
@@ -131,6 +140,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Jul 16 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-1
+- telepathy-qt-0.9.3
+
 * Wed Jul 11 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
 - 0.9.2
 


More information about the scm-commits mailing list