[kdelibs] - move udisks/upower dep to main pkg (from -devel)

[Rex Dieter]

commit 166d42fb9b815bcf1ea02f5d9e1673efe296bb25
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 26 16:22:53 2010 -0600

    - move udisks/upower dep to main pkg (from -devel)

 kdelibs.spec |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index ea23fb6..e1fb958 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -12,7 +12,7 @@
 
 Summary: KDE Libraries
 Version: 4.5.80
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -149,6 +149,15 @@ BuildRequires: dbusmenu-qt-devel
 %define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
 
+# halsectemy on f15+
+%if 0%{?fedora} > 14
+%define halsectemy 1
+Requires: udisks upower
+%else
+BuildRequires: hal-devel
+Requires: hal-storage-addon
+%endif
+
 %if 0%{?apidocs}
 BuildRequires: docbook-dtds
 BuildRequires: doxygen
@@ -197,13 +206,6 @@ Requires: automoc4 >= 0.9.88
 Requires: cmake >= 2.6.4
 Requires: openssl-devel
 Requires: phonon-devel
-# halsectemy on f15+
-%if 0%{?fedora} > 14
-Requires: udisks upower
-%else
-BuildRequires: hal-devel
-Requires: hal-storage-addon
-%endif
 Provides: nepomuk-devel = %{version}-%{release}
 # considered part of nepomuk-devel
 Requires: shared-desktop-ontologies-devel soprano-devel
@@ -275,10 +277,11 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch200 -p1 -b .CVE-2009-2702
 
 # Fedora patches
-%if 0%{?fedora} && 0%{?fedora} > 14
+%if 0%{?halsectemy}
 %patch300 -p0 -b .no_HAL
 %endif
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -521,6 +524,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 26 2010 Rex Dieter <rdieter at fedoraproject.org> 4.5.80-7
+- move udisks/upower dep to main pkg (from -devel)
+
 * Wed Nov 24 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.5.80-6
 - explicitely require udisks/upower now that we depend on them