From f99c23eefbfddf1fe6ba70ef2eaefc7ee8f524a6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Oct 2016 14:54:16 -0500 Subject: [PATCH] set -DUTEMPTER_EXECUTABLE explicitly autodetection is failing for some reason --- kf5-kpty.spec | 13 ++++++++----- kpty-5.27.0-utempter_path.patch | 11 ----------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 kpty-5.27.0-utempter_path.patch diff --git a/kf5-kpty.spec b/kf5-kpty.spec index 82efb18..96aafe3 100755 --- a/kf5-kpty.spec +++ b/kf5-kpty.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.27.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE Frameworks 5 Tier 2 module providing Pty abstraction License: LGPLv2+ and GPLv2+ @@ -17,9 +17,6 @@ URL: https://quickgit.kde.org/?p=%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -## upstreamable patches -Patch100: kpty-5.27.0-utempter_path.patch - BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: kf5-kcoreaddons-devel >= %{version} @@ -50,7 +47,10 @@ developing applications that use %{name}. %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. +# find_program for utempter is failing for some reason, so +# set path explicitly to known-good value +%{cmake_kf5} .. \ + -DUTEMPTER_EXECUTABLE:PATH=/usr/libexec/utempter/utempter popd make %{?_smp_mflags} -C %{_target_platform} @@ -79,6 +79,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Oct 11 2016 Rex Dieter - 5.27.0-4 +- set -DUTEMPTER_EXECUTABLE explicitly + * Tue Oct 11 2016 Rex Dieter - 5.27.0-3 - patch to find /usr/libexec/utempter/utempter diff --git a/kpty-5.27.0-utempter_path.patch b/kpty-5.27.0-utempter_path.patch deleted file mode 100644 index 5fe0813..0000000 --- a/kpty-5.27.0-utempter_path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up kpty-5.27.0/cmake/FindUTEMPTER.cmake.utempter kpty-5.27.0/cmake/FindUTEMPTER.cmake ---- kpty-5.27.0/cmake/FindUTEMPTER.cmake.utempter 2016-10-06 15:57:41.000000000 -0500 -+++ kpty-5.27.0/cmake/FindUTEMPTER.cmake 2016-10-11 11:57:04.624010919 -0500 -@@ -36,6 +36,7 @@ find_program (UTEMPTER_EXECUTABLE utempt - ${KDE_INSTALL_FULL_LIBEXECDIR}/utempter - ${KDE_INSTALL_FULL_LIBDIR}/utempter - /usr/libexec/utempter -+ /usr/libexec/utempter/utempter - ) - - if (UTEMPTER_EXECUTABLE)