[k3b] Don't show suggestion to start HAL daemon when no CD/DVD device is found

[Radek Novacek]

commit 80cd4e6395c93bea77330520a78baf0395503b89
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Jun 12 10:11:58 2012 +0200

    Don't show suggestion to start HAL daemon when no CD/DVD device is found

 k3b-2.0.2-disable-hal-daemon-message.patch |   14 ++++++++++++++
 k3b.spec                                   |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/k3b-2.0.2-disable-hal-daemon-message.patch b/k3b-2.0.2-disable-hal-daemon-message.patch
new file mode 100644
index 0000000..40532d4
--- /dev/null
+++ b/k3b-2.0.2-disable-hal-daemon-message.patch
@@ -0,0 +1,14 @@
+diff -up k3b-2.0.2/src/k3bsystemproblemdialog.cpp.disble-hal-daemon-message k3b-2.0.2/src/k3bsystemproblemdialog.cpp
+--- k3b-2.0.2/src/k3bsystemproblemdialog.cpp.disble-hal-daemon-message	2012-06-12 09:54:46.908819352 +0200
++++ k3b-2.0.2/src/k3bsystemproblemdialog.cpp	2012-06-12 09:56:15.261113629 +0200
+@@ -187,7 +187,9 @@ void K3b::SystemProblemDialog::checkSyst
+                                            i18n("No optical drive found."),
+                                            i18n("K3b did not find any optical device in your system."),
+ #ifdef ENABLE_HAL_SUPPORT
+-                                           i18n("Make sure HAL daemon is running, it is used by K3b for finding devices.")
++                                           // This is not true, k3b don't use hal for device discovery any more
++                                           // i18n("Make sure HAL daemon is running, it is used by K3b for finding devices.")
++                                           QString()
+ #else
+                                            QString()
+ #endif
diff --git a/k3b.spec b/k3b.spec
index d8889a6..f10a902 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -3,7 +3,7 @@ Name:    k3b
 Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -31,6 +31,8 @@ Patch101: k3b-2.0.2-overburn-cdr90.patch
 Patch102: k3b-2.0.2-overburn-usedcapacity.patch
 # Remove WebKit on RHEL
 Patch103: k3b-2.0.2-no-webkit.patch
+# HAL is no longer used for device discovery, don't suggest starting HAL daemon
+Patch104: k3b-2.0.2-disable-hal-daemon-message.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -105,6 +107,8 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %patch103 -p1 -b .no-webkit
 %endif
 
+%patch104 -p1 -b .disble-hal-daemon-message
+
 %build
 
 mkdir -p %{_target_platform}
@@ -197,6 +201,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Tue Jun 12 2012 Radek Novacek <rnovacek at redhat.com> 1:2.0.2-11
+- Don't show suggestion to start HAL daemon when no CD/DVD device is found
+
 * Fri May 04 2012 Radek Novacek <rnovacek at redhat.com> 1:2.0.2-10
 - Fix conditional for RHEL