Downstream patch to fix hardcoded libexec path in start_kdeinit_wrapper

epel9
Dan Vrátil 11 years ago
parent 316057b72f
commit 04f01046fc

@ -3,7 +3,7 @@
Name: kf5-%{framework}
Version: 5.0.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: KDE Frameworks 5 tier 3 solution for process launching
License: LGPLv2+ and BSD
@ -14,6 +14,10 @@ URL: http://www.kde.org
#Source0: %{name}-%{version}-%{snapshot}git.tar.bz2
Source0: http://download.kde.org/stable/frameworks/%{version}/%{framework}-%{version}.tar.xz
# kdeinit_start and kdeinit_start_wrapper have some libexec paths hardocded
# at build-time, but they are wrong
Patch0: kinit-kdeinit-pathfix.patch
BuildRequires: libX11-devel
BuildRequires: kf5-rpm-macros
@ -57,6 +61,7 @@ developing applications that use %{name}.
%prep
%setup -q -n %{framework}-%{version}
%patch0 -p1 -b .kdeinit
%build
mkdir -p %{_target_platform}
@ -88,6 +93,9 @@ make %{?_smp_mflags} -C %{_target_platform}
%changelog
* Fri Jul 18 2014 Daniel Vrátil <dvratil@redhat.com> - 5.0.0-2
- Downstream patch to fix hardcoded libexec paths in start_kdeinit_wrapper
* Wed Jul 09 2014 Daniel Vrátil <dvratil@redhat.com> - 5.0.0-1
- KDE Frameworks 5.0.0

@ -0,0 +1,26 @@
diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c
index 02d4d54..8ddef1f 100644
--- a/src/start_kdeinit/start_kdeinit.c
+++ b/src/start_kdeinit/start_kdeinit.c
@@ -32,7 +32,7 @@
#include <sys/capability.h>
#endif
-#define EXECUTE CMAKE_INSTALL_PREFIX"/"BIN_INSTALL_DIR "/kdeinit5"
+#define EXECUTE BIN_INSTALL_DIR "/kdeinit5"
#if KDEINIT_OOM_PROTECT
diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c
index f35c4a9..9fdb6a0 100644
--- a/src/start_kdeinit/start_kdeinit_wrapper.c
+++ b/src/start_kdeinit/start_kdeinit_wrapper.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <unistd.h>
-#define EXECUTE CMAKE_INSTALL_PREFIX"/"KF5_LIBEXEC_INSTALL_DIR "/start_kdeinit"
+#define EXECUTE KF5_LIBEXEC_INSTALL_DIR "/start_kdeinit"
#if KDEINIT_OOM_PROTECT
Loading…
Cancel
Save