From 7801a8f7c3bb3521eece97eb89bb65f5e0494fd4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 28 Aug 2016 15:34:37 -0500 Subject: [PATCH 1/3] kde-connect-1.0 --- .gitignore | 3 +-- kde-connect.spec | 33 ++++++++++++--------------------- sources | 3 +-- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index a4b44ee..3fece8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /kdeconnect-kde-0.8.tar.xz -/kdeconnect-kde-0.9g.tar.xz -/kde-connect-a594324dgit.patch.gz +/kdeconnect-kde-1.0.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index ab3d46b..3235288 100644 --- a/kde-connect.spec +++ b/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 -Release: 7%{?dist} +Version: 1.0 +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,9 +26,6 @@ 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 @@ -79,7 +73,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 +113,7 @@ Requires: fuse-sshfs %prep -%setup -q -n kdeconnect-kde-%{version}g - -# makes app v1.0 compatible, don't apply yet -#patch1 -p1 +%setup -q -n kdeconnect-kde-%{version} %build @@ -159,9 +150,6 @@ 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 %{_builddir}/kde4/kdeconnect-kde-0.8/%{_target_platform}/kio @@ -205,7 +193,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 +213,9 @@ fi %postun libs -p /sbin/ldconfig %files libs -%{_kf5_libdir}/libkdeconnectpluginkcm.so.0* -%{_kf5_libdir}/libkdeconnectinterfaces.so.0* -%{_kf5_libdir}/libkdeconnectcore.so.0* +%{_kf5_libdir}/libkdeconnectpluginkcm.so.1* +%{_kf5_libdir}/libkdeconnectinterfaces.so.1* +%{_kf5_libdir}/libkdeconnectcore.so.1* %{_qt5_plugindir}/kdeconnect*.so %{_qt5_plugindir}/kdeconnect/ @@ -245,6 +233,9 @@ fi %changelog +* Sun Aug 28 2016 Rex Dieter - 1.0-1 +- kde-connect-1.0 + * Sun Jun 05 2016 Rex Dieter - 0.9-7 - prep git snapshot (for 1.0 compatibility), but don't use yet - kdeconnectd subpkg (#1324214) diff --git a/sources b/sources index f4d191a..c6b3877 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 43fbad180dc5412c8c0131399acaceea kdeconnect-kde-0.8.tar.xz -1472d071bd3d4f46c125a3aa0f387ca2 kdeconnect-kde-0.9g.tar.xz -57fb899933ae7471b8ed6b91927c718b kde-connect-a594324dgit.patch.gz +f5d09557300665de4144de24dc57ced4 kdeconnect-kde-1.0.tar.xz From 6b036bdf2513c8c433b551b8ddde6ce8ca369d2a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 28 Aug 2016 17:02:14 -0500 Subject: [PATCH 2/3] BR: kdoctools --- kde-connect.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-connect.spec b/kde-connect.spec index 3235288..46f8ff0 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -31,6 +31,7 @@ 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 From 562ed059be58f35f623050ea4ebcb23e33a55617 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 30 Aug 2016 11:21:42 -0500 Subject: [PATCH 3/3] fix kde4 build --- kde-connect.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/kde-connect.spec b/kde-connect.spec index 46f8ff0..454d5cb 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -116,6 +116,14 @@ Requires: fuse-sshfs %prep %setup -q -n kdeconnect-kde-%{version} +%if 0%{?_with_kde4} +tar xfJ %{SOURCE1} +pushd kdeconnect-kde-0.8 +%patch0 -p1 +popd +%endif + + %build mkdir %{_target_platform} @@ -126,18 +134,15 @@ popd make %{?_smp_mflags} -C %{_target_platform} %if 0%{?_with_kde4} -mkdir -p %{_builddir}/kde4 -cd %{_builddir}/kde4 -tar xfJ %{SOURCE1} -cd kdeconnect-kde-0.8 -%patch0 -p1 -mkdir -p %{_target_platform} +pushd kdeconnect-kde-0.8 +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. make %{?_smp_mflags} -C interfaces/ make %{?_smp_mflags} -C kio/ popd +popd %endif @@ -152,8 +157,8 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/services/kde desktop-file-edit --remove-key=OnlyShowIn %{buildroot}%{_sysconfdir}/xdg/autostart/kdeconnectd.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 +make install/fast DESTDIR=%{buildroot} -C kdeconnect-kde-0.8/%{_target_platform}/interfaces +make install/fast DESTDIR=%{buildroot} -C kdeconnect-kde-0.8/%{_target_platform}/kio # Remove undesired kde4 devel files rm -rfv %{buildroot}%{_includedir}/kde4/