[ktp-accounts-kcm] (re)enable telepathy-rakia support (#838585)

Rex Dieter rdieter at fedoraproject.org
Mon Jul 9 16:13:45 UTC 2012


commit 448232f521df6342334493c8c668d87fc3686d6a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 9 11:17:06 2012 -0500

    (re)enable telepathy-rakia support (#838585)

 ktp-accounts-kcm.spec |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/ktp-accounts-kcm.spec b/ktp-accounts-kcm.spec
index 09820b4..751d5fc 100644
--- a/ktp-accounts-kcm.spec
+++ b/ktp-accounts-kcm.spec
@@ -1,4 +1,8 @@
 
+%if 0%{?fedora} > 16
+%define rakia 1
+%endif
+
 Name:    ktp-accounts-kcm
 Summary: KDE Configuration Module for Telepathy Instant Messaging Accounts
 Version: 0.4.0
@@ -31,8 +35,10 @@ Requires: telepathy-gabble
 Requires: telepathy-haze
 ## irc
 #Requires: telepathy-idle
+%if 0%{?rakia}
 ## audio calls
-#Requires: telepathy-rakia
+Requires: telepathy-rakia >= 0.7.4
+%endif
 ## local xmpp
 Requires: telepathy-salut
 ## gadu/gadu
@@ -73,8 +79,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 ## unpackaged files
 rm -fv %{buildroot}%{_kde4_libdir}/libktpaccountskcminternal.so
-rm -fv %{buildroot}%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_{butterfly,rakia,sunshine}.so
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_{butterfly,rakia,sunshine}.desktop
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_{butterfly,sunshine}.so
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_{butterfly,sunshine}.desktop
+%if ! 0%{?rakia}
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_rakia.so
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_rakia.desktop
+%endif
 
 
 %post -p /sbin/ldconfig
@@ -90,8 +100,10 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_{butterf
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_gabble.so
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_haze.so
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_idle.so
-#{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_rakia.desktop
-#{_kde4_libdir}/kde4/ktpaccountskcm_plugin_rakia.so
+%if 0%{?rakia}
+%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_rakia.desktop
+%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_rakia.so
+%endif
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_salut.so
 %{_kde4_datadir}/kde4/services/kcm_ktp_accounts.desktop
 %{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_gabble.desktop
@@ -105,6 +117,9 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_{butterf
 
 
 %changelog
+* Mon Jul 09 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-2
+- (re)enable telepathy-rakia support (#838585)
+
 * Mon Jun 11 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-1
 - 0.4.0
 


More information about the scm-commits mailing list