dvratil pushed to ktp-accounts-kcm (master). "Update to 15.04.0"

Mon Apr 27 17:12:33 UTC 2015

>From 4be854833d5714d50ca1bfe3353d9e9a0953f19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 27 Apr 2015 19:12:23 +0200
Subject: Update to 15.04.0

diff --git a/.gitignore b/.gitignore
index 9376540..40252b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /ktp-accounts-kcm-0.8.1.tar.bz2
 /ktp-accounts-kcm-0.8.80.tar.bz2
 /ktp-accounts-kcm-0.9.0.tar.bz2
+/ktp-accounts-kcm-15.04.0.tar.xz
diff --git a/ktp-accounts-kcm.spec b/ktp-accounts-kcm.spec
index 34b8965..2b04160 100644
--- a/ktp-accounts-kcm.spec
+++ b/ktp-accounts-kcm.spec
@@ -1,48 +1,67 @@
-
-%if 0%{?fedora} > 16
-%define rakia 1
+Name:           ktp-accounts-kcm
+Summary:        KDE Configuration Module for Telepathy Instant Messaging Accounts
+Version:        15.04.0
+Release:        1%{?dist}
+
+License:        LGPLv2+
+URL:            https://projects.kde.org/projects/kde/kdenetwork/%{name}
+
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
+%else
+%global stable stable
 %endif
+Source0: http://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz
+
+
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  qt5-qtbase-devel
 
-Name:    ktp-accounts-kcm
-Summary: KDE Configuration Module for Telepathy Instant Messaging Accounts
-Version: 0.9.0
-Release: 1%{?dist}
+BuildRequires:  kf5-kcmutils-devel
+BuildRequires:  kf5-kio-devel
+BuildRequires:  kf5-kwidgetsaddons-devel
+BuildRequires:  kf5-kcodecs-devel
+BuildRequires:  kf5-kcoreaddons-devel
+BuildRequires:  kf5-kconfigwidgets-devel
+BuildRequires:  kf5-kiconthemes-devel
+BuildRequires:  kf5-kitemviews-devel
 
-License: LGPLv2+
-URL:     https://projects.kde.org/projects/extragear/network/telepathy/%{name}
-Source0: http://download.kde.org/stable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
+BuildRequires:  ktp-common-internals-devel
+
+BuildRequires:  telepathy-qt5-devel
+BuildRequires:  kaccounts-integration-devel
+BuildRequires:  intltool
+BuildRequires:  libaccounts-glib-devel
 
-BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: ktp-common-internals-devel >= %{version}
 ## FIXME: FTBFS on rawhide -- rex
 #BuildRequires: pkgconfig(ModemManagerQt)
 
-Obsoletes: telepathy-kde-accounts-kcm < 0.3.0
-Provides:  telepathy-kde-accounts-kcm = %{version}-%{release}
+Obsoletes:      telepathy-kde-accounts-kcm < 0.3.0
+Provides:       telepathy-kde-accounts-kcm = %{version}-%{release}
 
-Obsoletes: telepathy-kde-accounts-kcm-plugins < 0.2.0
-Provides:  telepathy-kde-accounts-kcm-plugins = %{version}-%{release}
+Obsoletes:      telepathy-kde-accounts-kcm-plugins < 0.2.0
+Provides:       telepathy-kde-accounts-kcm-plugins = %{version}-%{release}
 
-Obsoletes: telepathy-kde-accounts-kcm-devel < 0.2.0
+Obsoletes:      telepathy-kde-accounts-kcm-devel < 0.2.0
 
-Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
+# Headers are not installed since in 15.04.0-1
+Obsoletes:      %{name}-devel < 15.04.0-1
 
 # various protocol handlers
 ## msn (old)
 #Requires: telepathy-butterfly
 ## xmpp/jabber
-Requires: telepathy-gabble
+Requires:       telepathy-gabble
 ## msn (newer, libpurple)
-Requires: telepathy-haze
+Requires:       telepathy-haze
 ## irc
 #Requires: telepathy-idle
-%if 0%{?rakia}
 ## audio calls
-Requires: telepathy-rakia >= 0.7.4
-%endif
+Requires:       telepathy-rakia >= 0.7.4
 ## local xmpp
-Requires: telepathy-salut
+Requires:       telepathy-salut
 ## gadu/gadu
 #Requires: telepathy-sunshine
 
@@ -51,22 +70,19 @@ This is a KControl Module which handles adding/editing/removing Telepathy
 Accounts. It interacts with any Telepathy Spec compliant AccountManager
 to manipulate the accounts.
 
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: telepathy-qt4-devel
-%description devel
-%{summary}.
-
 
 %prep
 %setup -q -n %{name}-%{version}
 
 
 %build
+# KAccounts install cmake config already
+rm -fv cmake/modules/FindKAccounts.cmake
+sed -i "s/\${KACCOUNTS_LIBRARIES}/KAccounts/" plugins/kaccounts/CMakeLists.txt
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -75,52 +91,29 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --all-name --with-kde
-
 ## unpackaged files
-rm -fv %{buildroot}%{_kde4_libdir}/libktpaccountskcminternal.so
-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
+rm -fv %{buildroot}%{_kf5_libdir}/libktpaccountskcminternal.so
 
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %doc COPYING README
-%{_kde4_libdir}/libktpaccountskcminternal.so.4*
-%{_datadir}/telepathy/profiles/
-%{_kde4_libdir}/kde4/kcm_ktp_accounts.so
-#{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_butterfly.desktop
-#{_kde4_libdir}/kde4/ktpaccountskcm_plugin_butterfly.so
-%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_gabble.so
-%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_haze.so
-%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_idle.so
-%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_sipe.so
-%{_kde4_libdir}/kde4/ktpaccountskcm_plugin_morse.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
-%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_haze.desktop
-%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_idle.desktop
-%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_salut.desktop
-%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_sipe.desktop
-%{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_morse.desktop
-%{_kde4_datadir}/kde4/services/settings-im-and-voip.desktop
-%{_kde4_datadir}/kde4/servicetypes/ktpaccountskcminternal-accountuiplugin.desktop
-#{_kde4_libdir}/kde4/ktpaccountskcm_plugin_sunshine.so
-#{_kde4_datadir}/kde4/services/ktpaccountskcm_plugin_sunshine.desktop
+%{_kf5_libdir}/libktpaccountskcminternal.so.*
+%{_kf5_datadir}/kservicetypes5/ktpaccountskcminternal-accountuiplugin.desktop
+%{_datadir}/telepathy/profiles/*.profile
+%{_datadir}/accounts/services/*.service
+%{_datadir}/accounts/providers/*.provider
+%{_kf5_qtplugindir}/*.so
+%{_kf5_qtplugindir}/kaccounts/ui/ktpaccountskcm_plugin_kaccounts.so
+%{_kf5_datadir}/kservices5/*.desktop
 
 
 %changelog
+* Mon Apr 27 2015 Daniel Vrátil <dvratil at redhat.com> - 15.04.0-1
+- Update to 15.04.0 (switch to KF5/Plasma 5)
+
 * Mon Oct 20 2014 Jan Grulich <jgrulich at redhat.com> - 0.9.0-1
 - Update to 0.9.0
 
diff --git a/sources b/sources
index 7cb8cd9..b9cae98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd528ed8ef0955dece5b049e0c43886a  ktp-accounts-kcm-0.9.0.tar.bz2
+500dd36268d3634492fe87739d19a7f4  ktp-accounts-kcm-15.04.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ktp-accounts-kcm.git/commit/?h=master&id=4be854833d5714d50ca1bfe3353d9e9a0953f19c
