dvratil pushed to plasma-desktop (copr). "Fix kfontinst service path (rhbz#1208229)"

[notifications at fedoraproject.org]

>From 50e6ea41181b471662f5209ea3253ef19eaa95d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Thu, 2 Apr 2015 12:56:03 +0200
Subject: Fix kfontinst service path (rhbz#1208229)


diff --git a/plasma-desktop-fix-fontinst-service-path.patch b/plasma-desktop-fix-fontinst-service-path.patch
new file mode 100644
index 0000000..36e471f
--- /dev/null
+++ b/plasma-desktop-fix-fontinst-service-path.patch
@@ -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_ABSOLUTE_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_ABSOLUTE_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_ABSOLUTE_DIR@/fontinst
+ User=root
+ 
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 5ddf391..6de15e9 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
 Name:           plasma-desktop
 Version:        5.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -18,6 +18,9 @@ Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve
 # adjust default kickoff favorites: +konsole +apper
 Patch100: plasma-desktop-5.2.1-default_favorites.patch
 
+## upstream patches
+Patch200: plasma-desktop-fix-fontinst-service-path.patch
+
 BuildRequires:  libusb-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libX11-devel
@@ -108,9 +111,6 @@ Conflicts:      kcm_colors < 1:4.11.16-10
 %prep
 %autosetup -p1
 
-# Workaround broken path in Dbus service file (until fixed upstream)
-sed -i "s/@CMAKE_INSTALL_PREFIX@\///" kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
-
 
 %build
 
@@ -222,6 +222,9 @@ fi
 
 
 %changelog
+* Thu Apr 02 2015 Daniel Vrátil <dvratil at redhat.com> 5.2.2-4
+- fix fontinst service paths (rhbz#1208229)
+
 * Mon Mar 30 2015 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-3
 - own /usr/share/plasma/shells/org.kde.plasma.desktop/updates
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=copr&id=50e6ea41181b471662f5209ea3253ef19eaa95d5