From 6de607e912d2fd12cdcbccd71a27c68bba8f53ba Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 28 Sep 2015 19:06:39 -0500
Subject: [PATCH] re-fix font management, kauth_helper paths (#1208229,
 kde#353215)

---
 plasma-desktop-5.4.1-kauth_helper.patch | 31 +++++++++++++++++++++++++
 plasma-desktop.spec                     | 11 ++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 plasma-desktop-5.4.1-kauth_helper.patch

diff --git a/plasma-desktop-5.4.1-kauth_helper.patch b/plasma-desktop-5.4.1-kauth_helper.patch
new file mode 100644
index 0000000..bdf8a30
--- /dev/null
+++ b/plasma-desktop-5.4.1-kauth_helper.patch
@@ -0,0 +1,31 @@
+diff -up plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake.kauth_helper plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake
+--- plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake.kauth_helper	2015-09-03 05:48:44.000000000 -0500
++++ plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake	2015-09-28 18:38:00.560763031 -0500
+@@ -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_ABSOLUTE_DIR}"
+ 
+ /* Define to 1 if you have the <locale.h> header file. */
+ #cmakedefine HAVE_LOCALE_H 1
+diff -up plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake.kauth_helper plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
+--- plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake.kauth_helper	2015-09-03 05:48:44.000000000 -0500
++++ plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake	2015-09-28 18:39:12.058195439 -0500
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=org.kde.fontinst
+-Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
++Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst
+ 
+diff -up plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake.kauth_helper plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
+--- plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake.kauth_helper	2015-09-03 05:48:44.000000000 -0500
++++ plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake	2015-09-28 18:41:09.250906989 -0500
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=org.kde.fontinst
+-Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
++Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst
+ User=root
+ 
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index b19739f..f8c96a8 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -3,7 +3,7 @@
 
 Name:           plasma-desktop
 Version:        5.4.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -32,6 +32,10 @@ Patch103: plasma-desktop-C_locale.patch
 # master branch
 
 ## upstreamable patches
+# consistently use KAUTH_HELPER_INSTALL_ABSOLUTE_DIR instead of CMAKE_INSTALL_PREFIX/KAUTH_HELPER_INSTALL_DIR
+# FIXME: seems upstream expects KAUTH_HELPER_INSTALL_DIR to be relative, figure out why our default build flags
+# set that to be absolute instead.
+Patch50: plasma-desktop-5.4.1-kauth_helper.patch
 
 BuildRequires:  libusb-devel
 BuildRequires:  fontconfig-devel
@@ -156,6 +160,8 @@ BuildArch: noarch
 %prep
 %setup -q
 
+%patch50 -p1 -b .kauth_helper
+
 %if 0%{?fedora} > 22
 %patch100 -p1 -b .default_favorites
 %else
@@ -301,6 +307,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-6
+- re-fix font management, kauth_helper paths (#1208229, kde#353215)
+
 * Mon Sep 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-5
 - restore f22 default favorites