rpms/kdelibs/devel kdelibs-4.3.90-kauth-polkitqt1.patch, NONE, 1.1 kdelibs.spec, 1.567, 1.568

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31247

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.90-kauth-polkitqt1.patch 
Log Message:
* Fri Jan 08 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.90-4
- fix kauth polkit policies installation


kdelibs-4.3.90-kauth-polkitqt1.patch:
 KDE4Macros.cmake |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE kdelibs-4.3.90-kauth-polkitqt1.patch ---
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()
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -p -r1.567 -r1.568
--- kdelibs.spec	7 Jan 2010 14:38:32 -0000	1.567
+++ kdelibs.spec	8 Jan 2010 15:54:36 -0000	1.568
@@ -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 <jreznik at redhat.com> - 4.3.90-4
+- fix kauth polkit policies installation
+
 * Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-3
 - bump min polkit-qt version(s)