(re)fix fontinst service paths (#1208229)

epel9
Rex Dieter 10 years ago
parent e821f2c56d
commit 0793b300f1

@ -0,0 +1,34 @@
diff --git a/kcms/kfontinst/config-fontinst.h.cmake b/kcms/kfontinst/config-fontinst.h.cmake
index f2e6014..b44e8de 100644
--- a/kcms/kfontinst/config-fontinst.h.cmake
+++ b/kcms/kfontinst/config-fontinst.h.cmake
@@ -1,7 +1,7 @@
#ifndef __CONFIG_FONTINST_H__
#define __CONFIG_FONTINST_H__
-#define KFONTINST_LIB_EXEC_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}"
+#define KFONTINST_LIB_EXEC_DIR "${KAUTH_HELPER_INSTALL_DIR}"
/* Define to 1 if you have the <locale.h> header file. */
#cmakedefine HAVE_LOCALE_H 1
diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake b/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
index e212a88..a2915b5 100644
--- a/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
+++ b/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.kde.fontinst
-Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
+Exec=@KAUTH_HELPER_INSTALL_DIR@/fontinst
diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake b/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
index be6927f..c8b540f 100644
--- a/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
+++ b/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=org.kde.fontinst
-Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
+Exec=@KAUTH_HELPER_INSTALL_DIR/fontinst
User=root

@ -1,6 +1,6 @@
Name: plasma-desktop Name: plasma-desktop
Version: 5.3.0 Version: 5.3.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Plasma Desktop shell Summary: Plasma Desktop shell
License: GPLv2+ and (GPLv2 or GPLv3) License: GPLv2+ and (GPLv2 or GPLv3)
@ -17,6 +17,8 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve
## downstream patches ## downstream patches
# adjust default kickoff favorites: -preferred_browser(buggy) +konqueror +konsole +apper # adjust default kickoff favorites: -preferred_browser(buggy) +konqueror +konsole +apper
Patch100: plasma-desktop-5.2.1-default_favorites.patch Patch100: plasma-desktop-5.2.1-default_favorites.patch
# FIXME: make upstreamable, fix dup'd PREFIX KAUTH_HELPER_INSTALL_DIR when using absolute paths
Patch101: plasma-desktop-fix-fontinst-service-path.patch
## upstream patches ## upstream patches
@ -246,6 +248,9 @@ fi
%changelog %changelog
* Sun May 03 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.0-4
- (re)fix fontinst service paths (#1208229)
* Wed Apr 29 2015 Daniel Vrátil <dvratil@redhat.com> - 5.3.0-3 * Wed Apr 29 2015 Daniel Vrátil <dvratil@redhat.com> - 5.3.0-3
- Provides plasmashell(desktop) (#1215691) - Provides plasmashell(desktop) (#1215691)

Loading…
Cancel
Save