[ktp-accounts-kcm] drop telepathy-sunshine support (f17+)

Rex Dieter rdieter at fedoraproject.org
Fri Feb 10 14:49:10 UTC 2012


commit 825fcd7834959b98ebf8935692e0aa371ff2091b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Feb 10 08:49:04 2012 -0600

    drop telepathy-sunshine support (f17+)

 ktp-accounts-kcm.spec |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/ktp-accounts-kcm.spec b/ktp-accounts-kcm.spec
index 64acfb0..696ebed 100644
--- a/ktp-accounts-kcm.spec
+++ b/ktp-accounts-kcm.spec
@@ -1,8 +1,12 @@
 
+%if 0%{?fedora} && 0%{?fedora} < 17
+%define sunshine 1
+%endif
+
 Name:    ktp-accounts-kcm
 Summary: KDE Configuration Module for Telepathy Instant Messaging Accounts
 Version: 0.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 URL:     https://projects.kde.org/projects/extragear/network/telepathy/%{name}
@@ -30,7 +34,9 @@ Requires: telepathy-haze
 Requires: telepathy-idle
 Requires: telepathy-rakia
 Requires: telepathy-salut
+%if 0%{?sunshine}
 Requires: telepathy-sunshine
+%endif
 
 %description
 This is a KControl Module which handles adding/editing/removing Telepathy
@@ -67,6 +73,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 ## unpackaged files
 rm -fv %{buildroot}%{_kde4_libdir}/libktpaccountskcminternal.so
+%if ! 0%{?sunshine}
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_sunshine.so
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_sunshine.desktop
+%endif
 
 
 %post -p /sbin/ldconfig
@@ -83,7 +93,6 @@ rm -fv %{buildroot}%{_kde4_libdir}/libktpaccountskcminternal.so
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_idle.so
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_rakia.so
 %{_kde4_libdir}/kde4/ktpaccountskcm_plugin_salut.so
-%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_sunshine.so
 %{_kde4_datadir}/kde4/services/kcm_ktp_accounts.desktop
 %{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_butterfly.desktop
 %{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_gabble.desktop
@@ -91,12 +100,18 @@ rm -fv %{buildroot}%{_kde4_libdir}/libktpaccountskcminternal.so
 %{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_idle.desktop
 %{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_rakia.desktop
 %{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_salut.desktop
-%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_sunshine.desktop
 %{_kde4_datadir}/kde4/services/settings-im-and-voip.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktpaccountskcminternal-accountuiplugin.desktop
+%if 0%{?sunshine}
+%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_sunshine.so
+%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_sunshine.desktop
+%endif
 
 
 %changelog
+* Fri Feb 10 2012 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-3
+- drop telepathy-sunshine support (f17+)
+
 * Tue Feb 07 2012 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
 - improve %%description
 - drop BR: telepathy-qt4-devel


More information about the scm-commits mailing list