[kdebase] drop kate, konsole, to be packaged separately. update summary to mention included apps/utilities Pro

[Rex Dieter]

commit 7b87f581880a14770161a9674f330b6344eaf26a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jul 21 13:07:08 2011 -0500

    drop kate, konsole, to be packaged separately.
    update summary to mention included apps/utilities
    Provides: kde-baseapps (matching new upstream tarball)

 kdebase-4.6.80-packaging_cmake.patch |   19 ------------
 kdebase.spec                         |   52 +++++++++++-----------------------
 sources                              |    2 -
 3 files changed, 17 insertions(+), 56 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index 3ecefc8..6c6633f 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -2,15 +2,12 @@ Name:    kdebase
 Summary: KDE Core Applications 
 Epoch:   6
 Version: 4.6.95
-Release: 2%{?dist}
+Release: 10%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-baseapps-%{version}.tar.bz2
-# Kate and konsole is in separate tarball since 4.6.80
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kate-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/konsole-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search path for plugins
@@ -28,15 +25,13 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 # Password & User account becomes non responding
 Patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
-# packaging hack
-Patch10: kdebase-4.6.80-packaging_cmake.patch
-
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
 Provides:  dolphin = 1.0.2-1
 Provides:  kdebase4 = %{version}-%{release}
+Provides:  kde-baseapps = %{version}-%{release}
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
@@ -49,7 +44,6 @@ Obsoletes: konq-plugins < 4.6.80-1
 Provides:  konq-plugins = %{version}-%{release}
 
 Provides: konqueror = %{version}-%{release}
-Provides: konsole = %{version}-%{release}
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -66,7 +60,6 @@ BuildRequires: kdepimlibs-devel >= %{version}
 %if 0%{?fedora}
 BuildRequires: libtidy-devel
 %endif
-BuildRequires: plasma-devel >= %{version}
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pciutils-devel
@@ -82,7 +75,14 @@ BuildRequires: soprano-devel
 Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
-Core applications for KDE 4.
+Core applications for KDE 4, including:
+dolphin : File manager
+kdepasswd : Changes a UNIX password.
+kdialog : Nice dialog boxes from shell scripts
+keditbookmarks : Bookmark oranizer and editor
+kfind : File find utility
+kfmclient : Tool for opening URLs from the command line
+konqueror : Web browser, file manager and document viewer
 
 %package -n kde-plasma-folderview
 Summary: FolderView plasma applet
@@ -113,22 +113,7 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 
 
 %prep
-%setup -q -n kde-baseapps-%{version}%{?alphatag}
-# kate and konsole are packaged separately
-# unpack kate
-%setup -q -T -D -a 1 -n kde-baseapps-%{version}%{?alphatag}
-# extract kwrite
-mv kate-%{version}/kwrite ./kwrite
-# get rid of the rest of kate
-rm -rf kate-%{version}
-
-#unpack konsole
-%setup -q -T -D -a 2 -n kde-baseapps-%{version}%{?alphatag}
-# move to proper path
-mv konsole-%{version} konsole
-
-# make kwrite and konsole build within kdebase
-%patch10 -p2 -b .packaging_cmake
+%setup -q -n kde-baseapps-%{version}
 
 %patch0 -p2 -b .nsplugins-paths
 %patch1 -p2 -b .konsole-activetabindex
@@ -222,9 +207,6 @@ fi
 %{_kde4_bindir}/kfind
 %{_kde4_bindir}/kfmclient
 %{_kde4_bindir}/konqueror
-%{_kde4_bindir}/konsole
-%{_kde4_bindir}/konsoleprofile
-%{_kde4_bindir}/kwrite
 %{_kde4_bindir}/nspluginscan
 %{_kde4_bindir}/nspluginviewer
 %{_kde4_bindir}/servicemenudeinstallation
@@ -240,8 +222,6 @@ fi
 %{_kde4_datadir}/applications/kde4/kfmclient_war.desktop
 %{_kde4_datadir}/applications/kde4/konqbrowser.desktop
 %{_kde4_datadir}/applications/kde4/konquerorsu.desktop
-%{_kde4_datadir}/applications/kde4/konsole.desktop
-%{_kde4_datadir}/applications/kde4/kwrite.desktop
 %{_kde4_appsdir}/akregator/
 %{_kde4_appsdir}/dolphin/
 %{_kde4_appsdir}/dolphinpart/
@@ -256,11 +236,9 @@ fi
 %{_kde4_appsdir}/khtml/
 %{_kde4_appsdir}/konqsidebartng/
 %{_kde4_appsdir}/konqueror/
-%{_kde4_appsdir}/konsole/
 %if 0%{?fedora}
 %{_kde4_appsdir}/kwebkitpart/*
 %endif
-%{_kde4_appsdir}/kwrite/
 %{_kde4_appsdir}/nsplugin/
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -280,7 +258,6 @@ fi
 %{_kde4_datadir}/templates/*.desktop
 %{_kde4_datadir}/templates/.source/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/libkonsoleprivate.so
 
 #exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
 #exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
@@ -305,8 +282,13 @@ fi
 
 
 %changelog
+* Thu Jul 21 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.95-10
+- drop kate, konsole, to be packaged separately.
+- update summary to mention included apps/utilities
+- Provides: kde-baseapps (matching new upstream tarball)
+
 * Mon Jul 18 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.95-2
-- Provides: konqueror, kdebase
+- Provides: konqueror, konsole
 
 * Fri Jul 08 2011 Jaroslav Reznik <jreznik at redhat.com> - 6:4.6.95-1
 - 4.6.95 (rc2)
diff --git a/sources b/sources
index 10823ec..4753da7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 527425ead69df6612ea06ad70ef50315  kde-baseapps-4.6.95.tar.bz2
-6e2c9738995fa1da32aa34c593998d97  kate-4.6.95.tar.bz2
-675d0f81349109f4c497a1d2e3f7a43c  konsole-4.6.95.tar.bz2