diff --git a/yakuake-2.8.1.tar.bz2 b/yakuake-2.8.1.tar.bz2 deleted file mode 100644 index 381d831..0000000 --- a/yakuake-2.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4780a4e138ccd31e9788fc9723a33f1addfa4eb2678fd3bc612d6ab7bdcd5fc8 -size 535406 diff --git a/yakuake-2.9.4.tar.bz2 b/yakuake-2.9.4.tar.bz2 new file mode 100644 index 0000000..baeced3 --- /dev/null +++ b/yakuake-2.9.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70c436e57fff180200fd03308e18bc8f9890b56cfc9f9e5e03dfce419f11a6bc +size 216489 diff --git a/yakuake-fix_Accesskey_handling_v2.diff b/yakuake-fix_Accesskey_handling_v2.diff deleted file mode 100644 index 1ba6611..0000000 --- a/yakuake-fix_Accesskey_handling_v2.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- yakuake-2.8_beta1/yakuake/src/main_window.cpp 2007-09-07 17:50:14.000000000 +0200 -+++ yakuake-2.8_beta1/yakuake/src/main_window.cpp 2007-09-07 17:50:16.000000000 +0200 -@@ -35,6 +35,8 @@ - KMainWindow(parent, name, Qt::WStyle_Customize | Qt::WStyle_NoBorder), - step(0) - { -+ bool haveAccessKey = false; -+ - first_run_dialog = 0; - about_app = 0; - about_kde = 0; -@@ -205,12 +207,20 @@ - connect(tab_bar, SIGNAL(itemSelected(int)), this, SLOT(slotSelectSession(int))); - connect(&desk_info, SIGNAL(workAreaChanged()), this, SLOT(slotUpdateSize())); - -+ - // Startup notification popup. -- if (Settings::popup() && !Settings::firstrun()) -- showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(global_key->shortcut("AccessKey").toString())); -+ if (!Settings::firstrun()) { -+ QString _key = global_key->shortcut("AccessKey").toString(); -+ if (!_key.isEmpty()) { -+ if (Settings::popup()) { -+ showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(_key)); -+ } -+ haveAccessKey = true; -+ } -+ } - - // First run dialog. -- if (Settings::firstrun()) -+ if (Settings::firstrun() || !haveAccessKey) - { - QTimer::singleShot(0, this, SLOT(slotToggleState())); - QTimer::singleShot(0, this, SLOT(slotOpenFirstRunDialog())); -@@ -1051,6 +1060,8 @@ - global_key->updateConnections(); - global_key->writeSettings(&config); - -+ config.sync(); -+ - slotDialogFinished(); - } - -@@ -1066,6 +1077,8 @@ - - actionCollection()->writeShortcutSettings("Shortcuts", &config); - -+ config.sync(); -+ - slotDialogFinished(); - } - -@@ -1179,6 +1192,7 @@ - global_key->setShortcut("AccessKey", first_run_dialog_page->shortcut()); - global_key->updateConnections(); - global_key->writeSettings(&config); -+ config.sync(); - } - - Settings::setFirstrun(false); diff --git a/yakuake.changes b/yakuake.changes index 537ed53..cc999d2 100644 --- a/yakuake.changes +++ b/yakuake.changes @@ -1,8 +1,18 @@ +------------------------------------------------------------------- +Sun Sep 21 14:53:51 CEST 2008 - stbinner@suse.de + +- require kde4-konsole (bnc#422066) + ------------------------------------------------------------------- Sun Sep 21 14:52:18 CEST 2008 - stbinner@suse.de - require kdebase3 (bnc#422066) +------------------------------------------------------------------- +Fri Sep 21 14:51:24 CEST 2008 - stbinner@suse.de + +- update to version 2.9.4, fourth bug fix release of KDE4 port + ------------------------------------------------------------------- Tue Feb 26 03:10:08 CET 2008 - crrodriguez@suse.de diff --git a/yakuake.desktop b/yakuake.desktop deleted file mode 100644 index d43fda8..0000000 --- a/yakuake.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=yakuake -Name[xx]=xxyakukakexx -Name[de]=YaKuake -GenericName=Console -Exec=yakuake -Icon=yakuake -Type=Application -Comment=A terminal for KDE -Comment[de]=Ein Termial für KDE -X-KDE-StartupNotify=true -X-DCOP-ServiceType=Multi -X-KDE-AuthorizeAction=shell_access -Categories=Qt;KDE;System;TerminalEmulator; diff --git a/yakuake.spec b/yakuake.spec index 095c903..a3a27dd 100644 --- a/yakuake.spec +++ b/yakuake.spec @@ -1,7 +1,7 @@ # -# spec file for package yakuake (Version 2.8.1) +# spec file for package yakuake (Version 2.9.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,18 @@ Name: yakuake -BuildRequires: kdelibs3-devel +BuildRequires: kdebase4-workspace-devel License: GPL v2 or later Url: http://kde-apps.org/content/show.php?content=29153 Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: yakuake is a terminal for KDE -Version: 2.8.1 -Release: 90 -%define rversion 2.8.1 -Source: %{name}-%{rversion}.tar.bz2 -Source1: yakuake.desktop -Patch1: yakuake-fix_Accesskey_handling_v2.diff -Requires: kdebase3 +Version: 2.9.4 +Release: 1 +Source: yakuake-%{version}.tar.bz2 +Requires: kde4-konsole +Provides: kde4-yakuake = 2.9.4 +Obsoletes: kde4-yakuake <= 2.9.4 %description Yakuake is a retractable KDE Terminal Emulator. @@ -43,25 +42,17 @@ Authors: Francois Chazal %prep -%setup -n %{name}-%{rversion} -q -%patch1 -p1 -. /etc/opt/kde3/common_options -update_admin +%setup -n yakuake-%{version} -q %build -. /etc/opt/kde3/common_options -./configure -make + %cmake_kde4 -d build + %make_jobs %install -. /etc/opt/kde3/common_options -make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET -%if %suse_version < 1010 -%suse_update_desktop_file %name System TerminalEmulator -%else -%suse_update_desktop_file -G "Terminal Program" %name System TerminalEmulator -%endif -%find_lang %{name} + cd build + %makeinstall + %suse_update_desktop_file -G "Terminal Program" yakuake System TerminalEmulator + %find_lang yakuake %post -p /sbin/ldconfig @@ -70,18 +61,21 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files -f build/yakuake.lang %defattr(-,root,root) -%doc README AUTHORS ChangeLog COPYING INSTALL -/opt/kde3/bin/* -/opt/kde3/share/apps/yakuake -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/yakuake.desktop -/opt/kde3/share/config.kcfg/yakuake.kcfg +%doc README AUTHORS ChangeLog COPYING COPYING.DOC NEWS +/usr/bin/yakuake +/usr/share/applications/kde4/yakuake.desktop +/usr/share/icons/hicolor/*/apps/yakuake.* +/usr/share/kde4/apps/yakuake %changelog * Sun Sep 21 2008 stbinner@suse.de +- require kde4-konsole (bnc#422066) +* Sun Sep 21 2008 stbinner@suse.de - require kdebase3 (bnc#422066) +* Sun Sep 21 2008 stbinner@suse.de +- update to version 2.9.4, fourth bug fix release of KDE4 port * Tue Feb 26 2008 crrodriguez@suse.de - use find_lang macro * Sun Jan 27 2008 stbinner@suse.de