From 870a0969eed5ca8f175f3b65b8659bd6d28f6c43 Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Fri, 8 Jan 2010 15:54:36 +0000 Subject: [PATCH] * Fri Jan 08 2010 Jaroslav Reznik - 4.3.90-4 - fix kauth polkit policies installation --- kdelibs-4.3.90-kauth-polkitqt1.patch | 18 ++++++++++++++++++ kdelibs.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.3.90-kauth-polkitqt1.patch diff --git a/kdelibs-4.3.90-kauth-polkitqt1.patch b/kdelibs-4.3.90-kauth-polkitqt1.patch new file mode 100644 index 0000000..43784c9 --- /dev/null +++ b/kdelibs-4.3.90-kauth-polkitqt1.patch @@ -0,0 +1,18 @@ +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 + + 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) + endif() + diff --git a/kdelibs.spec b/kdelibs.spec index 4c2cac0..cffd927 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -13,7 +13,7 @@ Summary: KDE Libraries Version: 4.3.90 -Release: 3%{?dist} +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -89,6 +89,9 @@ Patch24: kdelibs-4.3.1-drkonq.patch # workaound for low-mem systems (ppc64), tracking here (for now), # https://bugzilla.redhat.com/show_bug.cgi?id=539697 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch +# installs kauth pk1 policies +# MUST BE UPSTREAMED! +Patch27: kdelibs-4.3.90-kauth-polkitqt1.patch # upstream @@ -234,6 +237,7 @@ format for easy browsing. %if 0%{?fedora} > 11 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments %endif +%patch27 -p1 -b .kauth-polkitqt1 # upstream patches @@ -447,6 +451,9 @@ rm -rf %{buildroot} %changelog +* Fri Jan 08 2010 Jaroslav Reznik - 4.3.90-4 +- fix kauth polkit policies installation + * Thu Jan 07 2010 Rex Dieter - 4.3.90-3 - bump min polkit-qt version(s)