* Mon Jan 11 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-5
- hopefully correct kauth fix (old polkit cmake module is broken)
This commit is contained in:
parent
2c2c4789c6
commit
b7b1453eb4
@ -1,18 +1,19 @@
|
|||||||
diff -up kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake.kauth-polkitqt1 kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake
|
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.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
|
+++ kdelibs-4.3.90/cmake/modules/KDE4Macros.cmake 2010-01-11 17:38:19.724562080 +0100
|
||||||
@@ -1291,6 +1291,14 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
|
@@ -1292,6 +1292,15 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
|
||||||
|
|
||||||
if (POLKITQT_FOUND)
|
if (POLKITQT_FOUND)
|
||||||
install(FILES ${_output} DESTINATION ${POLKITQT_POLICY_FILES_INSTALL_DIR})
|
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 (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()
|
endif()
|
||||||
|
|
||||||
|
endfunction(KDE4_INSTALL_AUTH_ACTIONS)
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.3.90
|
Version: 4.3.90
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -454,6 +454,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 11 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-5
|
||||||
|
- hopefully correct kauth fix (old polkit cmake module is broken)
|
||||||
|
|
||||||
* Fri Jan 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-4
|
* Fri Jan 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-4
|
||||||
- fix kauth polkit policies installation
|
- fix kauth polkit policies installation
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user