[kdepim/f15] * add rhel conditional * drop old conditional

[Than Ngo]

commit 90cf0f7cd00639781cec5cd8df3ef1b49e6f213a
Author: Than Ngo <than at redhat.com>
Date:   Mon Aug 29 18:30:59 2011 +0200

    * add rhel conditional
    * drop old conditional

 kdepim.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/kdepim.spec b/kdepim.spec
index 8521cd8..97f934c 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -5,7 +5,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7 
 Version: 4.4.11.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -42,12 +42,6 @@ Patch100: kdepim-4.4.11.1-kde247486.patch
 # https://projects.kde.org/projects/kde/kdepim/repository/revisions/c2439ffb5c89ed3df8e4d1bf5ea32efc43d732ff
 Patch101: kdepim-4.4.11.1-kleopatra-libassuan2.patch
 
-
-Obsoletes: bilbo < 1:1.0
-%if 0%{?fedora} < 13
-Provides:  bilbo = 1:1.0
-%endif
-
 Provides: kdepim4 = %{version}-%{release}
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -55,11 +49,6 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 # beware bootstrapping (ie, build kdepim-runtime first)
 Requires: kdepim4-runtime >= %{version}
 
-%if 0%{?fedora} < 13
-# upgrade path
-Requires: kpilot
-%endif
-
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -68,7 +57,7 @@ BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= 4.4.5 
-%if 0%{?fedora} > 14
+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
 # build against the default libassuan (2) on Fedora >= 15
 BuildRequires: libassuan-devel
 %else
@@ -275,6 +264,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 29 2011 Than Ngo <than at redhat.com> - 7:4.4.11.1-6
+- add rhel conditional 
+
 * Mon Jun 13 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.4.11.1-5
 - build against libassuan 2 on Fedora 15 to prevent symbol conflict (kde#269258)