Merge branch 'master' into f23

.gitignore

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

kde-connect.spec

@@ -3,12 +3,9 @@
 %global _with_kde4 1
 %endif
 
-# After tag v0.8 with Frameworks
-#define _git_describe v0.8-339-g2b34d28
-
 Name:           kde-connect
-Version:        0.9
+Version:        1.0
-Release:        7%{?dist}
+Release:        1%{?dist}
 License:        GPLv2+
 Summary:        KDE Connect client for communication with smartphones
 
@@ -19,7 +16,7 @@ Url:            https://projects.kde.org/kdeconnect-kde
 # then rename accordingly
 Source0:        kdeconnect-kde-%{_git_describe}.tar.xz
 %else
-Source0:        http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}g.tar.xz
+Source0:        http://download.kde.org/stable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz
 %endif
 Source1:        http://download.kde.org/unstable/kdeconnect/0.8/src/kdeconnect-kde-0.8.tar.xz
 
@@ -29,14 +26,12 @@ Source2:        kde-connect.xml
 # Upstream patch for KDE 4 version
 Patch0:         kdeconnect-kde-0.8-b-revision.patch
 
-# 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
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  kf5-kcmutils-devel
+BuildRequires:  kf5-kdoctools-devel
 BuildRequires:  kf5-kconfigwidgets-devel
 BuildRequires:  kf5-kdbusaddons-devel
 BuildRequires:  kf5-ki18n-devel
@@ -79,7 +74,7 @@ Requires:       kde-cli-tools
 KDE Connect adds communication between KDE and your smartphone.
 
 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
+KDE Connect 1.0 app from Albert Vaka which you can obtain via Google Play, F-Droid
 or the project website.
 
 %package -n kdeconnectd
@@ -119,10 +114,15 @@ Requires: fuse-sshfs
 
 
 %prep
-%setup -q -n kdeconnect-kde-%{version}g
+%setup -q -n kdeconnect-kde-%{version}
+
+%if 0%{?_with_kde4}
+tar xfJ %{SOURCE1}
+pushd kdeconnect-kde-0.8
+%patch0 -p1
+popd
+%endif
 
-# makes app v1.0 compatible, don't apply yet
-#patch1 -p1
 
 
 %build
@@ -134,18 +134,15 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 %if 0%{?_with_kde4}
-mkdir -p  %{_builddir}/kde4
+pushd kdeconnect-kde-0.8
-cd %{_builddir}/kde4
+mkdir %{_target_platform}
-tar xfJ %{SOURCE1}
-cd kdeconnect-kde-0.8
-%patch0 -p1
-mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 
 make %{?_smp_mflags} -C interfaces/
 make %{?_smp_mflags} -C kio/
 popd
+popd
 %endif
 
 
@@ -159,12 +156,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/services/kde
 # 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 kdeconnect-kde-0.8/%{_target_platform}/interfaces
-make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-0.8/%{_target_platform}/kio
+make install/fast DESTDIR=%{buildroot} -C kdeconnect-kde-0.8/%{_target_platform}/kio
 
 # Remove undesired kde4 devel files
 rm -rfv %{buildroot}%{_includedir}/kde4/
@@ -205,7 +199,7 @@ fi
 %{_datadir}/applications/org.kde.kdeconnect.kcm.desktop
 %{_datadir}/applications/org.kde.kdeconnect.nonplasma.desktop
 %{_qt5_archdatadir}/qml/org/kde/kdeconnect/
-#{_kf5_docdir}/HTML/en/kdeconnect/
+%{_kf5_docdir}/HTML/en/kdeconnect-kde/
 
 %post -n kdeconnectd
 %{?firewalld_reload}
@@ -225,9 +219,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%{_kf5_libdir}/libkdeconnectpluginkcm.so.0*
+%{_kf5_libdir}/libkdeconnectpluginkcm.so.1*
-%{_kf5_libdir}/libkdeconnectinterfaces.so.0*
+%{_kf5_libdir}/libkdeconnectinterfaces.so.1*
-%{_kf5_libdir}/libkdeconnectcore.so.0*
+%{_kf5_libdir}/libkdeconnectcore.so.1*
 %{_qt5_plugindir}/kdeconnect*.so
 %{_qt5_plugindir}/kdeconnect/
 
@@ -245,6 +239,9 @@ fi
 
 
 %changelog
+* Sun Aug 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0-1
+- kde-connect-1.0
+
 * 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)

sources

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