[kdelibs] enable udisks2, +Requires: udisks2 on f18+ too

[Rex Dieter]

commit 2c8917553d2fd5d5825b04c668d0c0614fc1262e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 16 13:15:47 2012 -0500

    enable udisks2, +Requires: udisks2 on f18+ too

 kdelibs.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 40d057c..9541990 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -11,6 +11,11 @@
 %if 0%{?fedora} && 0%{?fedora} > 16
 %define libplasma_pk 1
 %endif
+%if %{?rhel} > 6 || 0%{?fedora} > 17
+%define udisks udisks2
+%else
+%define udisks udisks
+%endif
 
 %global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
 %global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
@@ -20,7 +25,7 @@
 
 Summary: KDE Libraries
 Version: 4.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -202,7 +207,7 @@ BuildRequires: zlib-devel
 %define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
 %{?x_deps:BuildRequires: %{x_deps}}
 
-Requires: udisks upower
+Requires: %{?udisks} upower
 
 %if 0%{?apidocs}
 BuildRequires: docbook-dtds
@@ -335,7 +340,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %if 0%{?fedora}
 %patch300 -p1 -b .halectomy
 %endif
-%if 0%{?rhel}
+%if "%{?udisks}" == "udisks"
 pushd solid
 %patch301 -p4 -b .udisks2backend
 popd
@@ -587,6 +592,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 16 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.8.2-4
+- enable udisks2, +Requires: udisks2 on f18+ too
+
 * Mon Apr 16 2012 Lukas Tinkl <ltinkl at redhat.com> - 6:4.8.2-3
 - add udisks2 Solid backend plus RHEL conditional