[kdepim/f15] Full list of commits to backport, update patch.

[Kevin Kofler]

commit 3e0303c3998ba1d2efd5e09347695acf844c8554
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jun 13 23:53:46 2011 +0200

    Full list of commits to backport, update patch.

 kdepim-4.4.11.1-kleopatra-libassuan2.patch |   28 +++++++++++++++++++++++++++-
 kdepim.spec                                |    4 ++++
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/kdepim-4.4.11.1-kleopatra-libassuan2.patch b/kdepim-4.4.11.1-kleopatra-libassuan2.patch
index a8e9daf..2d09cbe 100644
--- a/kdepim-4.4.11.1-kleopatra-libassuan2.patch
+++ b/kdepim-4.4.11.1-kleopatra-libassuan2.patch
@@ -255,7 +255,7 @@ diff -Nur kdepim-4.4.11.1/cmake/modules/FindAssuan2.cmake kdepim-4.4.11.1-kleopa
 +set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved )
 diff -Nur kdepim-4.4.11.1/kleopatra/CMakeLists.txt kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/CMakeLists.txt
 --- kdepim-4.4.11.1/kleopatra/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
-+++ kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/CMakeLists.txt	2011-06-13 19:59:47.000000000 +0200
++++ kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/CMakeLists.txt	2011-06-13 23:51:44.000000000 +0200
 @@ -28,7 +28,11 @@
    ${QGPGME_INCLUDES}
    ${GPGME_INCLUDES} )
@@ -443,6 +443,15 @@ diff -Nur kdepim-4.4.11.1/kleopatra/ConfigureChecks.cmake kdepim-4.4.11.1-kleopa
  
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_LIBRARIES)
+diff -Nur kdepim-4.4.11.1/kleopatra/libkleopatraclient/CMakeLists.txt kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/libkleopatraclient/CMakeLists.txt
+--- kdepim-4.4.11.1/kleopatra/libkleopatraclient/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
++++ kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/libkleopatraclient/CMakeLists.txt	2011-06-13 23:45:59.000000000 +0200
+@@ -1,4 +1,4 @@
+-set( libkleopatraclient_version "0.2.1" )
++set( libkleopatraclient_version "0.3.0" )
+ set( libkleopatraclient_soversion "0" )
+ 
+ add_subdirectory( core )
 diff -Nur kdepim-4.4.11.1/kleopatra/libkleopatraclient/core/CMakeLists.txt kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/libkleopatraclient/core/CMakeLists.txt
 --- kdepim-4.4.11.1/kleopatra/libkleopatraclient/core/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
 +++ kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/libkleopatraclient/core/CMakeLists.txt	2011-06-13 19:59:47.000000000 +0200
@@ -661,6 +670,23 @@ diff -Nur kdepim-4.4.11.1/kleopatra/libkleopatraclient/core/initialization.cpp k
  }
  
  Initialization::~Initialization() {
+diff -Nur kdepim-4.4.11.1/kleopatra/tests/CMakeLists.txt kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/tests/CMakeLists.txt
+--- kdepim-4.4.11.1/kleopatra/tests/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
++++ kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/tests/CMakeLists.txt	2011-06-13 23:50:06.000000000 +0200
+@@ -60,7 +60,12 @@
+     kde4_add_executable(test_uiserver TEST ${test_uiserver_SRCS})
+   endif(WIN32)
+ 
+-  target_link_libraries(test_uiserver ${KDE4_KDECORE_LIBS} )
++  if ( ASSUAN2_FOUND )
++    target_link_libraries(test_uiserver ${KDE4_KDECORE_LIBS} ${ASSUAN2_LIBRARIES})
++  else ( ASSUAN2_FOUND )
++    target_link_libraries(test_uiserver ${KDE4_KDECORE_LIBS} ${ASSUAN_LIBRARIES})
++  endif ( ASSUAN2_FOUND )
++
+   if(WIN32)
+ 	 target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
+   else(WIN32)
 diff -Nur kdepim-4.4.11.1/kleopatra/tests/test_uiserver.cpp kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/tests/test_uiserver.cpp
 --- kdepim-4.4.11.1/kleopatra/tests/test_uiserver.cpp	2011-04-20 22:03:31.000000000 +0200
 +++ kdepim-4.4.11.1-kleopatra-libassuan2/kleopatra/tests/test_uiserver.cpp	2011-06-13 20:03:26.000000000 +0200
diff --git a/kdepim.spec b/kdepim.spec
index 6ae4cc9..619da7c 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -34,8 +34,12 @@ Patch100: kdepim-4.4.11.1-kde247486.patch
 
 # allow build against libassuan 2
 # https://projects.kde.org/projects/kde/kdepim/repository/revisions/5fbe9239ffd9db5a7afb5b98a87953b27d46874c
+# https://projects.kde.org/projects/kde/kdepim/repository/revisions/c833e660ead32a3a1e1bf0d29aef10e7cebfb605
+# https://projects.kde.org/projects/kde/kdepim/repository/revisions/e61b462c3ed029cb5794fa930f1d9adacb8383c0
 # https://projects.kde.org/projects/kde/kdepim/repository/revisions/c00ca889b9d45c03626548baf18a066dff488585
 # https://projects.kde.org/projects/kde/kdepim/repository/revisions/5a49c54078270633c87750b50213080d83a67718
+# https://projects.kde.org/projects/kde/kdepim/repository/revisions/570d91419fac1b766c8047d42a5bede1dc19112d
+# https://projects.kde.org/projects/kde/kdepim/repository/revisions/c2439ffb5c89ed3df8e4d1bf5ea32efc43d732ff
 Patch101: kdepim-4.4.11.1-kleopatra-libassuan2.patch