From b7b1453eb4e1aa417996896043d76bd762487843 Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Mon, 11 Jan 2010 16:45:58 +0000 Subject: [PATCH] * Mon Jan 11 2010 Jaroslav Reznik - 4.3.90-5 - hopefully correct kauth fix (old polkit cmake module is broken) --- kdelibs-4.3.90-kauth-polkitqt1.patch | 23 ++++++++++++----------- kdelibs.spec | 5 ++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/kdelibs-4.3.90-kauth-polkitqt1.patch b/kdelibs-4.3.90-kauth-polkitqt1.patch index 43784c9..55f4771 100644 --- a/kdelibs-4.3.90-kauth-polkitqt1.patch +++ b/kdelibs-4.3.90-kauth-polkitqt1.patch @@ -1,18 +1,19 @@ diff -up kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake.kauth-polkitqt1 kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake --- kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake.kauth-polkitqt1 2009-11-23 16:30:10.000000000 +0100 -+++ kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake 2010-01-08 16:01:36.662585172 +0100 -@@ -1291,6 +1291,14 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE - ++++ kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake 2010-01-11 17:38:19.724562080 +0100 +@@ -1292,6 +1292,15 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE if (POLKITQT_FOUND) install(FILES ${_output} DESTINATION ${POLKITQT_POLICY_FILES_INSTALL_DIR}) -+ else (POLKITQT_FOUND) -+ if (NOT POLKITQT-1_FOUND) -+ macro_optional_find_package(PolkitQt-1) -+ endif (NOT POLKITQT-1_FOUND) -+ -+ if (POLKITQT-1_FOUND) -+ install(FILES ${_output} DESTINATION ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) -+ endif (POLKITQT-1_FOUND) endif (POLKITQT_FOUND) ++ ++ if (NOT POLKITQT-1_FOUND) ++ macro_optional_find_package(PolkitQt-1) ++ endif (NOT POLKITQT-1_FOUND) ++ ++ if (POLKITQT-1_FOUND) ++ install(FILES ${_output} DESTINATION ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) ++ endif (POLKITQT-1_FOUND) ++ endif() + endfunction(KDE4_INSTALL_AUTH_ACTIONS) diff --git a/kdelibs.spec b/kdelibs.spec index fb4827c..70a648c 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -13,7 +13,7 @@ Summary: KDE Libraries Version: 4.3.90 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -454,6 +454,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 11 2010 Jaroslav Reznik - 4.3.90-5 +- hopefully correct kauth fix (old polkit cmake module is broken) + * Fri Jan 08 2010 Jaroslav Reznik - 4.3.90-4 - fix kauth polkit policies installation