diff --git a/.cvsignore b/.cvsignore index 812a6c0..bd9e501 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -konversation-1.2-beta1.tar.bz2 +konversation-1.2-rc1.tar.bz2 diff --git a/konversation-1.2-ircview_autoexpand.patch b/konversation-1.2-ircview_autoexpand.patch deleted file mode 100644 index 1c20be6..0000000 --- a/konversation-1.2-ircview_autoexpand.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- trunk/extragear/network/konversation/src/viewer/ircview.cpp 2009/09/21 18:15:42 1026397 -+++ trunk/extragear/network/konversation/src/viewer/ircview.cpp 2009/09/21 18:16:59 1026398 -@@ -1279,6 +1279,15 @@ - action->setData(Konversation::Topic); - } - -+void IRCView::resizeEvent(QResizeEvent *event) -+{ -+ QScrollBar *vbar = verticalScrollBar(); -+ bool atBottom = (vbar->value() == vbar->maximum()); -+ KTextBrowser::resizeEvent(event); -+ if (atBottom) -+ vbar->setValue(vbar->maximum()); -+} -+ - void IRCView::mouseMoveEvent(QMouseEvent* ev) - { - if (m_mousePressed && (m_pressPosition - ev->pos()).manhattanLength() > KApplication::startDragDistance()) ---- trunk/extragear/network/konversation/src/viewer/ircview.h 2009/09/21 18:15:42 1026397 -+++ trunk/extragear/network/konversation/src/viewer/ircview.h 2009/09/21 18:16:59 1026398 -@@ -229,6 +229,7 @@ - - void replaceDecoration(QString& line,char decoration,char replacement); - -+ virtual void resizeEvent(QResizeEvent *event); - virtual void mouseReleaseEvent(QMouseEvent* ev); - virtual void mousePressEvent(QMouseEvent* ev); - virtual void mouseMoveEvent(QMouseEvent* ev); diff --git a/konversation.spec b/konversation.spec index c14156c..b80b900 100644 --- a/konversation.spec +++ b/konversation.spec @@ -1,23 +1,18 @@ -%define pre beta1 -#define pre 20090921svn +%define pre rc1 Name: konversation Version: 1.2 -Release: 0.11.%{pre}%{?dist} +Release: 0.12.%{pre}%{?dist} Summary: A user friendly IRC client Group: Applications/Internet License: GPLv2+ URL: http://konversation.kde.org/ -Source0: http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2 -#Source0: konversation-1.2-%{pre}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2 +#Source0: http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -# http://websvn.kde.org/?view=rev&revision=1026398 -Patch100: konversation-1.2-ircview_autoexpand.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs4-devel @@ -40,11 +35,8 @@ to chat windows; configurable background colors and much more %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch100 -p4 -b .ircview_autoexpand - %build - mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. @@ -97,6 +89,9 @@ fi %changelog +* Sat Oct 03 2009 Rex Dieter - 1.2-0.12.rc1 +- konversation-1.2-rc1 + * Mon Sep 21 2009 Rex Dieter - 1.2-0.11.beta1 - With auto-expand input box, ircview doesn't scroll (kdebug #208097) diff --git a/sources b/sources index 7e0013d..dc276e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f6c352a5f0d0349fe2505c0e7f62192 konversation-1.2-beta1.tar.bz2 +9a672517399354296ec13a9368cbfcb8 konversation-1.2-rc1.tar.bz2