Merge branch 'f24' into f23

.gitignore

@@ -1,2 +1,3 @@
 /kdeconnect-kde-0.8.tar.xz
 /kdeconnect-kde-0.9g.tar.xz
+/kde-connect-a594324dgit.patch.gz

kde-connect.spec

@@ -1,14 +1,14 @@
 # once kf5 dolphin lands, may consider disabling this -- rex
-#if 0%{?fedora} < 23
+%if 0%{?fedora} < 24
 %global _with_kde4 1
-#endif
+%endif
 
 # After tag v0.8 with Frameworks
 #define _git_describe v0.8-339-g2b34d28
 
 Name:           kde-connect
 Version:        0.9
-Release:        4%{?dist}
+Release:        7%{?dist}
 License:        GPLv2+
 Summary:        KDE Connect client for communication with smartphones
 
@@ -29,7 +29,9 @@ Source2:        kde-connect.xml
 # Upstream patch for KDE 4 version
 Patch0:         kdeconnect-kde-0.8-b-revision.patch
 
-BuildRequires:  cmake
+# post v0.9g tag patches, dated 20160603, git revision a594324d4fbe8e561fbb021d465b9c98de4ffe7e
+Patch1: kde-connect-a594324dgit.patch.gz
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  extra-cmake-modules
 BuildRequires:  firewalld-filesystem
@@ -49,7 +51,7 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 BUildRequires:  qt5-qtx11extras-devel
 
-%if %{_with_kde4}
+%if 0%{?_with_kde4}
 BuildRequires:  kdelibs4-devel
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libfakekey)
@@ -60,13 +62,16 @@ Obsoletes: kde-connect-kde4-ioslave < 0.9
 Obsoletes: kde-connect-kde4-libs < 0.9
 %endif
 
+# upstream name
+Provides:       kdeconnect-kde = %{version}-%{release}
+
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       firewalld-filesystem
+Requires:       kdeconnectd = %{version}-%{release}
 Requires:       kf5-filesystem
 Requires:       fuse-sshfs
 Requires:       qca-qt5-ossl
 # /usr/bin/plasmawindowed (make optional at least until this is split out for bug #1286431)
-Recommends:     plasma-workspace
+#Recommends:     plasma-workspace
 # /usr/bin/kcmshell5
 Requires:       kde-cli-tools
 
@@ -77,6 +82,13 @@ Currently, you can pair with your Android devices over Wifi using the
 KDE Connect app from Albert Vaka which you can obtain via Google Play, F-Droid
 or the project website.
 
+%package -n kdeconnectd
+Summary: KDE Connect service
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: firewalld-filesystem
+%description -n kdeconnectd
+%{summary}.
+
 %package libs
 Summary: Runtime libraries for %{name}
 Requires: %{name} = %{version}-%{release}
@@ -109,6 +121,9 @@ Requires: fuse-sshfs
 %prep
 %setup -q -n kdeconnect-kde-%{version}g
 
+# makes app v1.0 compatible, don't apply yet
+#patch1 -p1
+
 
 %build
 mkdir %{_target_platform}
@@ -123,7 +138,7 @@ mkdir -p  %{_builddir}/kde4
 cd %{_builddir}/kde4
 tar xfJ %{SOURCE1}
 cd kdeconnect-kde-0.8
-patch -p1 < %{PATCH0}
+%patch0 -p1
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -141,7 +156,13 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/services/kde
 
 %find_lang %{name} --all-name
 
-%if %{_with_kde4}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1296523
+desktop-file-edit --remove-key=OnlyShowIn %{buildroot}%{_sysconfdir}/xdg/autostart/kdeconnectd.desktop
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1323421
+echo 'TryExec=Exec=plasmawindowed' >> %{buildroot}%{_datadir}/applications/org.kde.kdeconnect.nonplasma.desktop
+
+%if 0%{?_with_kde4}
 make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-0.8/%{_target_platform}/interfaces
 make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-0.8/%{_target_platform}/kio
 
@@ -159,7 +180,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdeconnect.no
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-%{?firewalld_reload}
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -168,28 +188,37 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-%{?firewalld_reload}
 fi
 
 %files -f %{name}.lang
 %license COPYING
-%{_libexecdir}/kdeconnectd
 %{_kf5_bindir}/kdeconnect-cli
 %{_kf5_datadir}/plasma/plasmoids/org.kde.kdeconnect/
 %{_kf5_datadir}/knotifications5/*
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservices5/*.protocol
 %{_kf5_datadir}/kservicetypes5/*.desktop
-%{_datadir}/dbus-1/services/*.service
+%{_qt5_plugindir}/kcm_kdeconnect.so
-%{_datadir}/icons/hicolor/*/*/*
+%{_qt5_plugindir}/kio_kdeconnect.so
+%{_datadir}/icons/hicolor/*/apps/kdeconnect.*
+%{_datadir}/icons/hicolor/*/status/*
 %{_datadir}/applications/org.kde.kdeconnect.kcm.desktop
 %{_datadir}/applications/org.kde.kdeconnect.nonplasma.desktop
-%{_qt5_prefix}/qml/org/kde/kdeconnect/
+%{_qt5_archdatadir}/qml/org/kde/kdeconnect/
-%{_qt5_prefix}/plugins/kcm_kdeconnect.so
+#{_kf5_docdir}/HTML/en/kdeconnect/
-%{_qt5_prefix}/plugins/kio_kdeconnect.so
+
-%{_qt5_prefix}/plugins/kdeconnect*.so
+%post -n kdeconnectd
-%{_qt5_prefix}/plugins/kdeconnect/
+%{?firewalld_reload}
+
+%postun -n kdeconnectd
+if [ $1 -eq 0 ] ; then
+%{?firewalld_reload}
+fi
+
+%files -n kdeconnectd
 %{_sysconfdir}/xdg/autostart/kdeconnectd.desktop
+%{_libexecdir}/kdeconnectd
+%{_datadir}/dbus-1/services/org.kde.kdeconnect.service
 %{_prefix}/lib/firewalld/services/kde-connect.xml
 
 %post libs -p /sbin/ldconfig
@@ -199,6 +228,8 @@ fi
 %{_kf5_libdir}/libkdeconnectpluginkcm.so.0*
 %{_kf5_libdir}/libkdeconnectinterfaces.so.0*
 %{_kf5_libdir}/libkdeconnectcore.so.0*
+%{_qt5_plugindir}/kdeconnect*.so
+%{_qt5_plugindir}/kdeconnect/
 
 %if 0%{?_with_kde4}
 %post kde4-libs -p /sbin/ldconfig
@@ -214,6 +245,17 @@ fi
 
 
 %changelog
+* Sun Jun 05 2016 Rex Dieter <rdieter@fedoraproject.org> - 0.9-7
+- prep git snapshot (for 1.0 compatibility), but don't use yet
+- kdeconnectd subpkg (#1324214)
+- kdeconnectd does not autostart on MATE (#1296523)
+
+* Fri Feb 19 2016 Rex Dieter <rdieter@fedoraproject.org> 0.9-6
+- drop kde4 support (f24+)
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Sat Jan 09 2016 Rex Dieter <rdieter@fedoraproject.org> 0.9-4
 - kde-connect-0.9g
 

sources

@@ -1,2 +1,3 @@
 43fbad180dc5412c8c0131399acaceea  kdeconnect-kde-0.8.tar.xz
 1472d071bd3d4f46c125a3aa0f387ca2  kdeconnect-kde-0.9g.tar.xz
+57fb899933ae7471b8ed6b91927c718b  kde-connect-a594324dgit.patch.gz