From 4fabcbc15f477ca5062df796f04fd6e678847ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 15 Sep 2014 15:40:24 +0200 Subject: [PATCH] Remove upstreamed patch --- kf5-kinit.spec | 6 ------ kinit-kdeinit-pathfix.patch | 26 -------------------------- 2 files changed, 32 deletions(-) delete mode 100644 kinit-kdeinit-pathfix.patch diff --git a/kf5-kinit.spec b/kf5-kinit.spec index 07439ad..9d9b701 100644 --- a/kf5-kinit.spec +++ b/kf5-kinit.spec @@ -14,10 +14,6 @@ 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 @@ -61,8 +57,6 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} -%patch0 -p1 -b .kdeinit - %build mkdir -p %{_target_platform} pushd %{_target_platform} diff --git a/kinit-kdeinit-pathfix.patch b/kinit-kdeinit-pathfix.patch deleted file mode 100644 index d4f0ff2..0000000 --- a/kinit-kdeinit-pathfix.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - #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 - #include - --#define EXECUTE CMAKE_INSTALL_PREFIX"/"KF5_LIBEXEC_INSTALL_DIR "/start_kdeinit" -+#define EXECUTE KF5_LIBEXEC_INSTALL_DIR "/start_kdeinit" - - #if KDEINIT_OOM_PROTECT -