dvratil pushed to ktp-kded-integration-module (master). "Update to 15.04.0"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 27 18:05:38 UTC 2015


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


diff --git a/.gitignore b/.gitignore
index 6be43ba..54fafe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /ktp-kded-integration-module-0.8.1.tar.bz2
 /ktp-kded-integration-module-0.8.80.tar.bz2
 /ktp-kded-integration-module-0.9.0.tar.bz2
+/ktp-kded-module-15.04.0.tar.xz
diff --git a/ktp-kded-integration-module.spec b/ktp-kded-integration-module.spec
index 7cf50ae..410df69 100644
--- a/ktp-kded-integration-module.spec
+++ b/ktp-kded-integration-module.spec
@@ -1,21 +1,38 @@
-
-Name:    ktp-kded-integration-module
-Summary: KDE integration for telepathy 
-Version: 0.9.0
-Release: 1%{?dist}
-
-License: LGPLv2+
-URL:     https://projects.kde.org/projects/extragear/network/telepathy/ktp-kded-module
-Source0: http://download.kde.org/stable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
-
-BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: ktp-common-internals-devel >= %{version}
-
-Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
-
-Obsoletes: telepathy-kde-integration-module < 0.3.0
-Provides:  telepathy-kde-integration-module = %{version}-%{release}
+Name:           ktp-kded-integration-module
+Summary:        KDE integration for telepathy
+Version:        15.04.0
+Release:        1%{?dist}
+
+License:        LGPLv2+
+URL:            https://projects.kde.org/projects/kde/kdenetwork/ktp-kded-module
+
+%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/ktp-kded-module-%{version}.tar.xz
+
+
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  qt5-qtbase-devel
+
+BuildRequires:  kf5-kdbusaddons-devel
+BuildRequires:  kf5-kwidgetsaddons-devel
+BuildRequires:  kf5-kconfig-devel
+BuildRequires:  kf5-ki18n-devel
+BuildRequires:  kf5-kio-devel
+BuildRequires:  kf5-knotifications-devel
+BuildRequires:  kf5-kconfigwidgets-devel
+BuildRequires:  kf5-kidletime-devel
+BuildRequires:  kf5-kcmutils-devel
+
+BuildRequires:  ktp-common-internals-devel >= %{version}
+
+Obsoletes:      telepathy-kde-integration-module < 0.3.0
+Provides:       telepathy-kde-integration-module = %{version}-%{release}
 
 %description
 This module sits in KDED and takes care of various bits of system
@@ -23,13 +40,13 @@ integration like setting user to auto-away or handling connection errors.
 
 
 %prep
-%setup -q
+%setup -q -n ktp-kded-module-%{version}
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -38,19 +55,20 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --all-name --with-kde 
-
 
-%files -f %{name}.lang
-%doc COPYING 
-%{_kde4_libdir}/kde4/kcm_ktp_integration_module.so
-%{_kde4_libdir}/kde4/kded_ktp_integration_module.so
-%{_kde4_datadir}/kde4/services/kcm_ktp_integration_module.desktop
-%{_kde4_datadir}/kde4/services/kded/kded_ktp_integration_module.desktop
+%files
+%license COPYING
+%{_kf5_qtplugindir}/kcm_ktp_integration_module.so
+%{_kf5_qtplugindir}/kded_ktp_integration_module.so
+%{_kf5_datadir}/kservices5/kcm_ktp_integration_module.desktop
+%{_kf5_datadir}/kservices5/kded/ktp_integration_module.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service
 
 
 %changelog
+* Mon Apr 27 2015 Daniel Vrátil <dvratil at redhat.com> - 15.04.0-1
+- Update to 15.04.0
+
 * 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 1cbb4f8..f0c2539 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04048e2d410853c84421762fda5462ae  ktp-kded-integration-module-0.9.0.tar.bz2
+e1679701ac72493eeb9741003ddcf4d9  ktp-kded-module-15.04.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ktp-kded-integration-module.git/commit/?h=master&id=505720eb48ba69198d5a65f4d0c73e8e69171543


More information about the scm-commits mailing list