From ab65181eaa078bb4d432a509c374d44d5e29a856 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Nov 2014 07:05:01 -0600 Subject: [PATCH] macros.kf5: PATH, prepend %_qt5_bindir instead of %_kf5_bindir (ie, /usr/bin) --- kf5.spec | 2 +- macros.kf5 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 406fca1..7577668 100644 --- a/kf5.spec +++ b/kf5.spec @@ -44,7 +44,7 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog * Mon Nov 24 2014 Rex Dieter 5.4.0-2 -- macros.kf5: as long as %%kf5_bindir = /usr/bin/, no need to modify PATH +- macros.kf5: PATH, prepend %%_qt5_bindir instead of %%_kf5_bindir (ie, /usr/bin) * Mon Nov 03 2014 Daniel Vrátil - 5.3.0-1 - KDE Frameworks 5.4.0 diff --git a/macros.kf5 b/macros.kf5 index f677202..20d541e 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -15,6 +15,7 @@ %cmake_kf5 \ QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ + PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \