From 48ff0d9f21aa30a88fa45f4308ceb2c9e65f8c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 16 Jan 2015 12:24:41 +0100 Subject: [PATCH] Add upstream patch to fix generator of DBus helper service files --- kauth-fix-dbus-helper-service-generator.patch | 13 +++++++++++++ kf5-kauth.spec | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 kauth-fix-dbus-helper-service-generator.patch diff --git a/kauth-fix-dbus-helper-service-generator.patch b/kauth-fix-dbus-helper-service-generator.patch new file mode 100644 index 0000000..c05090b --- /dev/null +++ b/kauth-fix-dbus-helper-service-generator.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/KF5AuthMacros.cmake b/cmake/KF5AuthMacros.cmake +index ab0b30a..50b7ad1 100644 +--- a/cmake/KF5AuthMacros.cmake ++++ b/cmake/KF5AuthMacros.cmake +@@ -18,7 +18,7 @@ function(KAUTH_INSTALL_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf + DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) + +- if(IS_ABSOLUTE KAUTH_HELPER_INSTALL_DIR) ++ if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR}) + set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR}) + else() + set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}") diff --git a/kf5-kauth.spec b/kf5-kauth.spec index f05f3c6..2a4a9af 100644 --- a/kf5-kauth.spec +++ b/kf5-kauth.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 2 integration module to perform actions as privileged user License: LGPLv2+ @@ -17,6 +17,9 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +# https://git.reviewboard.kde.org/r/122029/ +Patch0: kauth-fix-dbus-helper-service-generator.patch + BuildRequires: polkit-qt5-1-devel BuildRequires: kf5-rpm-macros @@ -44,6 +47,8 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} +%patch0 -p1 -b .dbushelper + %build mkdir -p %{_target_platform} pushd %{_target_platform} @@ -80,6 +85,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Fri Jan 16 2015 Daniel Vrátil - 5.6.0-2 +- Add upstream patch to fix generating of DBus helper service files + * Thu Jan 08 2015 Daniel Vrátil - 5.6.0-1 - KDE Frameworks 5.6.0