[yakuake] Requires: konsole drop old cruft

[Rex Dieter]

commit 91b7351c9153ad20b20f5e9b144a6547d89fef37
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 18 16:20:56 2011 -0500

    Requires: konsole
    drop old cruft

 yakuake.spec |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)
---
diff --git a/yakuake.spec b/yakuake.spec
index e683cea..0230c80 100644
--- a/yakuake.spec
+++ b/yakuake.spec
@@ -1,11 +1,7 @@
 
-%if 0%{?fedora} && 0%{?fedora} < 14
-%define dt_vendor fedora
-%endif
-
 Name:           yakuake
 Version:        2.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A drop-down terminal emulator
 
 Group:          User Interface/Desktops
@@ -17,7 +13,7 @@ Source0:        http://download.kde.org/stable/yakuake/%{version}/src/yakuake-%{
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # konsolepart
-Requires:       kdebase4%{?_kde4_version: >= %{_kde4_version}}
+Requires:       konsole%{?_kde4_version: >= %{_kde4_version}}
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -44,22 +40,11 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-## --vendor is discouraged/deprecated these days -- Rex
-%if 0%{?dt_vendor:1} 
-desktop-file-install --vendor=%{dt_vendor}                      \
-        --dir=%{buildroot}%{_kde4_datadir}/applications         \
-        --add-category=Utility                                  \
-        --delete-original                                       \
-        %{buildroot}%{_kde4_datadir}/applications/kde4/yakuake.desktop
-%endif
-
 %find_lang %{name} --with-kde
 
 
 %check
-%if ! 0%{?dt_vendor:1}
 desktop-file-validate  %{buildroot}%{_kde4_datadir}/applications/kde4/yakuake.desktop
-%endif
 
 
 %post
@@ -83,16 +68,16 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
 %{_kde4_bindir}/yakuake
-%if 0%{?dt_vendor:1}
-%{_kde4_datadir}/applications/%{dt_vendor}-yakuake.desktop
-%else
 %{_kde4_datadir}/applications/kde4/yakuake.desktop
-%endif
 %{_kde4_appsdir}/yakuake/
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Mon Jul 18 2011 Rex Dieter <rdieter at fedoraproject.org> 2.9.8-2
+- Requires: konsole
+- drop old cruft
+
 * Wed Feb 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.9.8-1
 - 2.9.8
 - License: GPLv2 or GPLv3