- Update to fixed frameworks 5 kdeconnect

.gitignore

@@ -1 +1,2 @@
 /kdeconnect-kde-0.8.tar.xz
+/kdeconnect-kde-v0.8-231-gfdf91aa.tar.xz

kde-connect.spec

@@ -1,24 +1,27 @@
+%define _git_describe v0.8-231-gfdf91aa
+
 Name:           kde-connect
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Summary:        KDE Connect client for communication with smartphones
 
 Url:            https://projects.kde.org/projects/playground/base/kdeconnect-kde
-Source0:        http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz
+Source0:        http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{_git_describe}.tar.xz
-
+
-BuildRequires:  gettext
+BuildRequires:  kf5-rpm-macros
-BuildRequires:  kdelibs4-devel
+BuildRequires:  extra-cmake-modules
-BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  qt5-qtbase-devel
-BuildRequires:  pkgconfig(libfakekey)
+BuildRequires:  qt5-qtdeclarative-devel
-BuildRequires:  pkgconfig(QJson)
+BuildRequires:  qca-qt5-devel
-BuildRequires:  pkgconfig(qca2)
+BuildRequires:  kf5-ki18n-devel
-
+Buildrequires:  kf5-kio-devel
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+BuildRequires:  kf5-kconfigwidgets-devel
-%{?_kde_runtime_requires}
+BuildRequires:  kf5-kdbusaddons-devel
-Requires:       fuse-sshfs
+BuildRequires:  kf5-kcmutils-devel
-# core/daemon.cpp comments hint qca-gnupg may be required too (but I doubt it) -- rex
+BuildRequires:  kf5-kiconthemes-devel
-Requires:       qca-ossl%{?_isa}
+
+Requires:       kf5-filesystem
 
 %description
 KDE Connect adds communication between KDE and your smartphone.
@@ -47,82 +50,68 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --all-name --with-kde
 
+%check
+desktop-file-edit --remove-not-show-in=Plasma --add-not-show-in=X-Plasma %{buildroot}/%{_datadir}/applications/kdeconnect-non-plasma.desktop 
+desktop-file-edit --remove-not-show-in=Plasma --add-not-show-in=X-Plasma %{buildroot}/%{_datadir}/applications/kdeconnect.desktop 
 
 %post
-/bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
+/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-  /bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+	touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-  /usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%posttrans
+%files
-/usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
-
-%files -f %{name}.lang
 %doc COPYING README
-%{_kde4_bindir}/kdeconnect-cli
+%{_libexecdir}/kdeconnectd
-#daemon
+%{_kf5_bindir}/kdeconnect-cli
-%{_libexecdir}/kde4/kdeconnectd
+%{_kf5_datadir}/plasma/*
-#kcm
+%{_kf5_datadir}/knotifications5/*
-%{_kde4_libdir}/kde4/kcm_kdeconnect.so
+%{_kf5_datadir}/kservices5/*.desktop
-%{_kde4_datadir}/applications/kde4/kdeconnect.desktop
+%{_kf5_datadir}/kservices5/*.protocol
-%{_kde4_datadir}/kde4/services/kcm_kdeconnect.desktop
+%{_kf5_datadir}/kservicetypes5/*.desktop
-#kio
+%{_datadir}/dbus-1/services/*.service
-%{_kde4_libdir}/kde4/kio_kdeconnect.so
+%{_datadir}/icons/hicolor/*/*/*
-%{_kde4_datadir}/kde4/services/kdeconnect.protocol
+%{_datadir}/applications/*.desktop
-#lib
+%{_qt5_prefix}/qml/org/kde/kdeconnect/*
-%{_kde4_libdir}/kde4/imports/org/kde/kdeconnect/
+%{_qt5_prefix}/plugins/*
-%{_kde4_libdir}/kde4/kded_kdeconnect.so
+%{_sysconfdir}/xdg/autostart/kdeconnectd.desktop
-#dbus interfaces
-%{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.daemon.xml
-%{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.battery.xml
-%{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.notifications.notification.xml
-%{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.notifications.xml
-%{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.xml
-%{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.sftp.xml
-%{_datadir}/dbus-1/services/org.kde.kdeconnect.service
-#modules
-%{_kde4_libdir}/kde4/kdeconnect*.so
-%{_kde4_appsdir}/kdeconnect/
-%{_kde4_appsdir}/plasma/plasmoids/kdeconnect/
-#module desktop files
-%{_kde4_datadir}/kde4/services/kdeconnect*.desktop
-%{_kde4_datadir}/kde4/services/kded/kdeconnect.desktop
-%{_kde4_datadir}/kde4/services/plasma-kdeconnect.desktop
-%{_kde4_datadir}/kde4/servicetypes/kdeconnect_plugin.desktop
-#icons
-%{_kde4_iconsdir}/hicolor/*/apps/kdeconnect.*
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
 
 %files libs
-%{_kde4_libdir}/libkdeconnectcore.so.1*
+%{_kf5_libdir}/libkdeconnectpluginkcm.so.0*
-%{_kde4_libdir}/libkdeconnectinterfaces.so.1*
+%{_kf5_libdir}/libkdeconnectinterfaces.so.0*
+%{_kf5_libdir}/libkdeconnectcore.so.0*
 
 %files devel
-%{_kde4_includedir}/KDEConnect/
+#%{_kf5_includedir}/KDEConnect/
-%{_kde4_includedir}/kdeconnect/
+#%{_kf5_includedir}/kdeconnect/
-%{_kde4_libdir}/cmake/KDEConnect/
+#%{_kf5_libdir}/cmake/KDEConnect/
-%{_kde4_libdir}/libkdeconnectcore.so
+#%{_kf5_libdir}/libkdeconnectcore.so
-%{_kde4_libdir}/libkdeconnectinterfaces.so
+#%{_kf5_libdir}/libkdeconnectinterfaces.so
 
 
 %changelog
+* Mon Apr 20 2015 Helio Chissini de Castro <helio@kde.org> - 0.8-2
+- KDE Connect KF5 snapshot based on 0.8
+
 * Sun Feb 22 2015 Rex Dieter <rdieter@fedoraproject.org> 0.8-1
 - KDE Connect 0.8 available (#1195011)
-- use %%{?_kde_runtime_requires} (instead of %%_kde4_version macro)
+- use %%{?_kde_runtime_requires} (instead of %%_kf5_version macro)
 
 * Thu Oct 16 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.7.3-1
 - kde-connect-0.7.3

sources

@@ -1 +1 @@
-7b84ebf785f44a1d022a1c0915555f5d  kdeconnect-kde-0.8.tar.xz
+7440336c6a67f023668ce32b997d42f8  kdeconnect-kde-v0.8-231-gfdf91aa.tar.xz