rpms/kdelibs/devel kdelibs-4.3.90-kauth-polkitqt1.patch, 1.1, 1.2 kdelibs.spec, 1.569, 1.570

[Jaroslav Reznik]

Author: jreznik

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

Modified Files:
	kdelibs-4.3.90-kauth-polkitqt1.patch kdelibs.spec 
Log Message:
* Mon Jan 11 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.90-5
- hopefully correct kauth fix (old polkit cmake module is broken)


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

Index: kdelibs-4.3.90-kauth-polkitqt1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.3.90-kauth-polkitqt1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-4.3.90-kauth-polkitqt1.patch	8 Jan 2010 15:54:36 -0000	1.1
+++ kdelibs-4.3.90-kauth-polkitqt1.patch	11 Jan 2010 16:45:58 -0000	1.2
@@ -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)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -p -r1.569 -r1.570
--- kdelibs.spec	8 Jan 2010 16:19:39 -0000	1.569
+++ kdelibs.spec	11 Jan 2010 16:45:58 -0000	1.570
@@ -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 <jreznik at redhat.com> - 4.3.90-5
+- hopefully correct kauth fix (old polkit cmake module is broken)
+
 * Fri Jan 08 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.90-4
 - fix kauth polkit policies installation