[kdelibs] fix branding and add hal tests to halectomy

[Jaroslav Reznik]

commit cc7e864ff94e13e07ee0b0dd768b7f49d3c3699e
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon May 30 16:16:45 2011 +0200

    fix branding and add hal tests to halectomy

 kdelibs-4.6.80-branding.patch  |    2 +-
 kdelibs-4.6.80-halectomy.patch |   29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs-4.6.80-branding.patch b/kdelibs-4.6.80-branding.patch
index fe65b35..ca378ad 100644
--- a/kdelibs-4.6.80-branding.patch
+++ b/kdelibs-4.6.80-branding.patch
@@ -5,7 +5,7 @@ diff -up kdelibs-4.6.80/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.6.80/kio
      d->useragent += QString::number(KDE::versionMajor());
      d->useragent += QL1C('.');
      d->useragent += QString::number(KDE::versionMinor());
-+    d->useragent += QL1C(" Fedora/@@VERSION_RELEASE@@");
++    d->useragent += QL1S(" Fedora/@@VERSION_RELEASE@@");
    }
    else
    {
diff --git a/kdelibs-4.6.80-halectomy.patch b/kdelibs-4.6.80-halectomy.patch
index 4932674..4edfd4c 100644
--- a/kdelibs-4.6.80-halectomy.patch
+++ b/kdelibs-4.6.80-halectomy.patch
@@ -1,6 +1,6 @@
 diff -up kdelibs-4.6.80/solid/solid/CMakeLists.txt.halectomy kdelibs-4.6.80/solid/solid/CMakeLists.txt
 --- kdelibs-4.6.80/solid/solid/CMakeLists.txt.halectomy	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.80/solid/solid/CMakeLists.txt	2011-05-27 14:46:20.350312427 +0200
++++ kdelibs-4.6.80/solid/solid/CMakeLists.txt	2011-05-30 14:55:43.380878553 +0200
 @@ -39,7 +39,6 @@ configure_file(config-processor.h.cmake 
  
  file(MAKE_DIRECTORY
@@ -62,7 +62,7 @@ diff -up kdelibs-4.6.80/solid/solid/CMakeLists.txt.halectomy kdelibs-4.6.80/soli
  if(APPLE)
 diff -up kdelibs-4.6.80/solid/solid/managerbase.cpp.halectomy kdelibs-4.6.80/solid/solid/managerbase.cpp
 --- kdelibs-4.6.80/solid/solid/managerbase.cpp.halectomy	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.80/solid/solid/managerbase.cpp	2011-05-27 14:43:22.367821121 +0200
++++ kdelibs-4.6.80/solid/solid/managerbase.cpp	2011-05-30 14:55:43.381878481 +0200
 @@ -30,7 +30,6 @@
  #if defined (Q_OS_MAC)
  #include "backends/iokit/iokitmanager.h"
@@ -104,3 +104,28 @@ diff -up kdelibs-4.6.80/solid/solid/managerbase.cpp.halectomy kdelibs-4.6.80/sol
  #        endif
  
  #        if defined (HUPNP_FOUND)
+diff -up kdelibs-4.6.80/solid/tests/CMakeLists.txt.halectomy kdelibs-4.6.80/solid/tests/CMakeLists.txt
+--- kdelibs-4.6.80/solid/tests/CMakeLists.txt.halectomy	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.80/solid/tests/CMakeLists.txt	2011-05-30 15:13:39.179352524 +0200
+@@ -15,21 +15,6 @@ endif(WIN32)
+ target_link_libraries(fakehardwaretest solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml\\"")
+ 
+-
+-########### halbasictest ###############
+-
+-if(NOT WIN32 AND NOT APPLE)
+-set(halbasictest_SRCS halbasictest.cpp )
+-
+-kde4_add_executable(halbasictest ${halbasictest_SRCS})
+-
+-if(WIN32)
+-  set_target_properties(halbasictest PROPERTIES COMPILE_FLAGS -DSOLID_EXPORT=)
+-endif(WIN32)
+-
+-target_link_libraries(halbasictest solid_static ${KDEWIN_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
+-endif(NOT WIN32 AND NOT APPLE)
+-
+ ########### solidhwtest ###############
+ 
+ set(solidhwtest_SRCS