From 2f4c0986d3fb406484a5b69e382d59f4d96f2b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 17 Feb 2015 16:26:45 +0100 Subject: [PATCH] Remove upstream patch --- kauth-fix-dbus-helper-service-generator.patch | 13 ------------- kf5-kauth.spec | 6 ------ 2 files changed, 19 deletions(-) delete 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 deleted file mode 100644 index c05090b..0000000 --- a/kauth-fix-dbus-helper-service-generator.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 3f9dd4f..121c343 100644 --- a/kf5-kauth.spec +++ b/kf5-kauth.spec @@ -17,9 +17,6 @@ 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 @@ -46,9 +43,6 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} -%patch0 -p1 -b .dbushelper - - %build mkdir %{_target_platform} pushd %{_target_platform}