From 70d74e630dd6da4ff51e0d81835588003a91110d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 1 Oct 2015 14:13:53 -0500 Subject: [PATCH] cosmetics, fix build (due to kpty build) --- kwrited.spec | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/kwrited.spec b/kwrited.spec index 996e2d6..f23aa8a 100644 --- a/kwrited.spec +++ b/kwrited.spec @@ -1,10 +1,11 @@ -Name: kwrited + +Name: kwrited +Summary: KDE Write Daemon Version: 5.4.2 Release: 1%{?dist} -Summary: KDE Write Daemon -License: GPLv2+ -URL: https://projects.kde.org/projects/kde/workspace/kwrited +License: GPLv2+ +URL: https://projects.kde.org/projects/kde/workspace/kwrited %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -12,18 +13,18 @@ URL: https://projects.kde.org/projects/kde/workspace/kwrited %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +## upstreamable patches Patch0: kwrited-call-setgroups.patch -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel - -BuildRequires: kf5-rpm-macros +BuildRequires: cmake BuildRequires: extra-cmake-modules - -BuildRequires: kf5-kpty-devel +BuildRequires: kf5-rpm-macros +BuildRequires: kf5-kpty-devel >= 5.13.0-2 BuildRequires: kf5-kdelibs4support-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel Requires: kf5-filesystem @@ -36,26 +37,36 @@ Conflicts: kde-workspace < 5.0.0-1 %description %{summary}. + %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .setgroups + %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} + %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + %files -%doc COPYING -%{_bindir}/kwrited +%license COPYING +# kpty built with utempter support +%if 1 +%{_kf5_qtpluginsdir}/kded_kwrited.so +%{_kf5_datadir}/kservices5/kded/kwrited.desktop +%else +%{_kf5_bindir}/kwrited %{_sysconfdir}/xdg/autostart/kwrited-autostart.desktop +%endif %{_kf5_datadir}/knotifications5/kwrited.notifyrc