[kdenetwork] kopete: build unconditionally, Requires: kate-part

[Rex Dieter]

commit 98b2a4055bead12eb077aacf9f3670df5d18074b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 8 20:23:29 2011 -0500

    kopete: build unconditionally, Requires: kate-part

 kdenetwork.spec |   30 ++++++------------------------
 1 files changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 747be91..74738fd 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -2,7 +2,7 @@ Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -19,13 +19,6 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 # rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf
 Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
-# HACK to omit FTBFS kopete for now
-# test against _qt48 macro when available -- rex
-#if 0%{?fedora} < 16
-%if 1
-%define kopete 1
-%endif
-
 ## upstream patches
 
 ## security patches
@@ -86,9 +79,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: %{name}-fileshare-samba = %{epoch}:%{version}-%{release}
 Requires: %{name}-kdnssd = %{epoch}:%{version}-%{release}
 Requires: %{name}-kget = %{epoch}:%{version}-%{release}
-%if 0%{?kopete}
 Requires: %{name}-kopete = %{epoch}:%{version}-%{release}
-%endif
 Requires: %{name}-kppp = %{epoch}:%{version}-%{release}
 Requires: %{name}-krdc = %{epoch}:%{version}-%{release}
 Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
@@ -96,9 +87,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
 %description
 Networking applications, including:
 * kget: downloader manager
-%if 0%{?kopete}
 * kopete: chat client
-%endif
 * kppp: dialer and front end for pppd
 * krdc: a client for Desktop Sharing and other VNC servers
 * krfb: Desktop Sharing server, allow others to access your desktop via VNC
@@ -109,19 +98,13 @@ BuildArch: noarch
 # when split occurred
 Conflicts: kdenetwork < 7:4.6.95-10
 Obsoletes: kdenetwork-libs < 7:4.6.95-10
-%if ! 0%{?kopete}
-Obsoletes: %{name}-kopete < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-kopete-devel < %{epoch}:%{version}-%{release}
-%endif
 %description common 
 %{summary}.
 
 %package devel
 Summary:  Development files for %{name}
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%if 0%{?kopete}
 Requires: %{name}-kopete-devel = %{epoch}:%{version}-%{release}
-%endif
 Requires: %{name}-krdc-devel = %{epoch}:%{version}-%{release}
 BuildArch: noarch
 %description devel
@@ -165,9 +148,10 @@ Requires: usermode-gtk
 %package kopete
 Summary: A chat client 
 Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: kate-part >= %{version}
+Requires: mozilla-filesystem
 # jabber
 Requires: qca-ossl%{?_isa}
-Requires: mozilla-filesystem
 %description kopete
 %{summary}.
 
@@ -235,7 +219,6 @@ pushd %{_target_platform}
 %{cmake_kde4} \
   -DWITH_JINGLE=TRUE \
   -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
-  %{!?kopete: -DBUILD_kopete:BOOL=OFF} \
   ..
 popd
 
@@ -259,9 +242,7 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/kppp
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kppp
 
 %find_lang kget --with-kde --without-mo
-%if 0%{?kopete}
 %find_lang kopete --with-kde --without-mo
-%endif
 %find_lang kppp --with-kde --without-mo
 %find_lang krdc --with-kde --without-mo
 %find_lang krfb --with-kde --without-mo
@@ -346,7 +327,6 @@ fi
 %files kget-libs
 %{_kde4_libdir}/libkgetcore.so.4*
 
-%if 0%{?kopete}
 %post kopete 
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -414,7 +394,6 @@ fi
 %files kopete-devel
 %{_kde4_includedir}/kopete/
 %{_kde4_libdir}/libkopete*.so
-%endif
 
 %post kppp
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -491,6 +470,9 @@ fi
 
 
 %changelog
+* Sat Oct 08 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.7.2-2
+- -kopete: build unconditionally, Requires: kate-part
+
 * Tue Oct 04 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.7.2-1
 - 4.7.2