From 562ed059be58f35f623050ea4ebcb23e33a55617 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 30 Aug 2016 11:21:42 -0500 Subject: [PATCH] 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/