[k3b] - build without ENABLE_HAL_SUPPORT (f15+) - spec cleanup

[Rex Dieter]

commit 1a55aac26275afbb6a9cb169932ce0e9ebdcf44e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 23 10:22:06 2010 -0600

    - build without ENABLE_HAL_SUPPORT (f15+)
    - spec cleanup

 k3b-2.0.1-disable_hal.patch  |   16 ++++++++++++++++
 k3b-2.0_settings-crash.patch |   37 -------------------------------------
 k3b.spec                     |   37 ++++++++++++++++++-------------------
 3 files changed, 34 insertions(+), 56 deletions(-)
---
diff --git a/k3b-2.0.1-disable_hal.patch b/k3b-2.0.1-disable_hal.patch
new file mode 100644
index 0000000..dbb5bfc
--- /dev/null
+++ b/k3b-2.0.1-disable_hal.patch
@@ -0,0 +1,16 @@
+diff -up k3b-2.0.1/CMakeLists.txt.hal k3b-2.0.1/CMakeLists.txt
+--- k3b-2.0.1/CMakeLists.txt.hal	2010-08-15 11:04:09.000000000 -0500
++++ k3b-2.0.1/CMakeLists.txt	2010-11-23 10:18:30.600170645 -0600
+@@ -224,9 +224,9 @@ if(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+  set(BUILD_EXTERNAL_ENCODER_PLUGIN 1)
+ endif(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+ 
+-if(NOT WIN32 AND NOT APPLE)
+-  set(ENABLE_HAL_SUPPORT 1)
+-endif(NOT WIN32 AND NOT APPLE)
++#if(NOT WIN32 AND NOT APPLE)
++ set(ENABLE_HAL_SUPPORT 0)
++#endif(NOT WIN32 AND NOT APPLE)
+ 
+ configure_file (config-k3b.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-k3b.h )
+ 
diff --git a/k3b.spec b/k3b.spec
index 3ab773b..5bbef3f 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -1,14 +1,14 @@
 
-# include sub pkgs
-%if 0%{?fedora} > 9 || 0%{?rhel} > 5
-%define common 1
+%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: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -16,9 +16,8 @@ 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)
 
-# Patch for crashing on open settings, remove this temporary workaround when fixed (#582764)
-# Upstream bug: https://bugs.kde.org/show_bug.cgi?id=238819
-Patch0: k3b-2.0_settings-crash.patch
+Patch1: k3b-2.0.1-disable_hal.patch
+
 # ie, where cdrecord and friends aren't present
 ExcludeArch: s390 s390x
 
@@ -39,14 +38,11 @@ BuildRequires: taglib-devel
 
 Requires: kdebase-runtime%{?_kde_version: >= %{_kde4_version}}
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-%if 0%{?common}
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%else
-Obsoletes: %{name}-common < %{epoch}:%{version}-%{release}
-Provides:  %{name}-common = %{epoch}:%{version}-%{release}
-%endif
 
-Requires: hal-storage-addon
+%if 0%{?hal}
+Requires: hal
+%endif
 Requires: cdrecord mkisofs
 Requires(hint): cdrdao
 Requires(hint): dvd+rw-tools
@@ -85,9 +81,9 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{version}
-%if "%{?_kde4_version}" < "4.5.2"
-# bug requiring this patch was reportedly fixed in kde-4.5.2
-%patch0 -p0
+
+%if ! 0%{?hal}
+%patch1 -p1 -b .disable_hal
 %endif
 
 
@@ -148,7 +144,7 @@ update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files %{?!common: -f k3b.lang}
+%files
 %defattr(-,root,root,-)
 %doc README COPYING COPYING.DOC ChangeLog
 %{_kde4_bindir}/k3b
@@ -163,9 +159,8 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 %{_kde4_datadir}/mime/packages/x-k3b.xml
 %{_kde4_iconsdir}/hicolor/*/*/*
 
-%if 0%{?common}
 %files common -f k3b.lang
-%endif
+%defattr(-,root,root,-)
 %{_kde4_appsdir}/k3b/
 %{_kde4_datadir}/sounds/k3b_*
 
@@ -182,6 +177,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Tue Nov 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.1-4
+- build without ENABLE_HAL_SUPPORT (f15+)
+- spec cleanup
+
 * Tue Nov 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.1-3
 - Requires: hal-storage-addon