[k3b] - turns out existing hal support is mostly harmless (not required, but will use if present), so ba

[Rex Dieter]

commit f5cd539f01496c2aa498ed6d0d7275b209f71723
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 23 11:29:42 2010 -0600

    - turns out existing hal support is mostly harmless (not required, but will
      use if present), so back out those changes.

 k3b-2.0.1-disable_hal.patch |   16 ----------------
 k3b.spec                    |   20 +++++---------------
 2 files changed, 5 insertions(+), 31 deletions(-)
---
diff --git a/k3b.spec b/k3b.spec
index 5bbef3f..2fed490 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -1,14 +1,9 @@
 
-%if 0%{?fedora} && 0%{?fedora} < 15 
-# include hal support
-%define hal 1
-%endif
-
 Name:    k3b
 Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
 Version: 2.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -16,8 +11,6 @@ URL:     http://www.k3b.org/
 Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: k3b-2.0.1-disable_hal.patch
-
 # ie, where cdrecord and friends aren't present
 ExcludeArch: s390 s390x
 
@@ -40,9 +33,6 @@ Requires: kdebase-runtime%{?_kde_version: >= %{_kde4_version}}
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 
-%if 0%{?hal}
-Requires: hal
-%endif
 Requires: cdrecord mkisofs
 Requires(hint): cdrdao
 Requires(hint): dvd+rw-tools
@@ -82,10 +72,6 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 
-%if ! 0%{?hal}
-%patch1 -p1 -b .disable_hal
-%endif
-
 
 %build
 
@@ -177,6 +163,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Tue Nov 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.1-5
+- turns out existing hal support is mostly harmless (not required, but will
+  use if present), so back out those changes.
+
 * Tue Nov 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.1-4
 - build without ENABLE_HAL_SUPPORT (f15+)
 - spec cleanup