diff --git a/.cvsignore b/.cvsignore index 2e44894..b83d7d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -konversation-1.2.3-20100510.tar.bz2 +konversation-1.3-beta1.tar.bz2 diff --git a/aa233e3b66b675c62a03f1bce793e67b87b732b9.patch b/aa233e3b66b675c62a03f1bce793e67b87b732b9.patch new file mode 100644 index 0000000..a6efc91 --- /dev/null +++ b/aa233e3b66b675c62a03f1bce793e67b87b732b9.patch @@ -0,0 +1,25 @@ +From aa233e3b66b675c62a03f1bce793e67b87b732b9 Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Sat, 22 May 2010 22:01:51 +0200 +Subject: [PATCH] Fix close buttons on tabs preference not being respected for top/bottom tabs. + +--- + src/viewer/viewcontainer.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp +index 6207f66..d7b30e6 100644 +--- a/src/viewer/viewcontainer.cpp ++++ b/src/viewer/viewcontainer.cpp +@@ -409,7 +409,7 @@ void ViewContainer::updateTabWidgetAppearance() + else + m_tabWidget->cornerWidget()->hide(); + +- m_tabWidget->tabBar()->setTabsClosable(true); ++ m_tabWidget->tabBar()->setTabsClosable(Preferences::self()->closeButtons()); + + m_tabWidget->setAutomaticResizeTabs(Preferences::self()->useMaxSizedTabs()); + } +-- +1.6.1 + diff --git a/konversation.spec b/konversation.spec index 13046cf..26cc41e 100644 --- a/konversation.spec +++ b/konversation.spec @@ -1,17 +1,20 @@ +%define pre beta1 + Name: konversation -Version: 1.2.3 -Release: 2.20100510%{?dist} +Version: 1.3 +Release: 0.1.%{pre}%{?dist} Summary: A user friendly IRC client Group: Applications/Internet License: GPLv2+ URL: http://konversation.kde.org/ -#Source0: ftp://ftp.kde.org/pub/kde/stable/konversation/%{version}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2 -Source0: konversation-%{version}-20100510.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/%{?pre:un}stable/konversation/%{version}%{?pre:-%{pre}}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches +# http://gitorious.org/konversation/konversation/commit/aa233e3b66b675c62a03f1bce793e67b87b732b9 +Patch100: http://gitorious.org/konversation/konversation/commit/aa233e3b66b675c62a03f1bce793e67b87b732b9.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -34,6 +37,8 @@ to chat windows; configurable background colors and much more %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} +%patch100 -p1 -b .fix_close_buttons + %build mkdir -p %{_target_platform} @@ -49,10 +54,7 @@ rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} - -## File lists -# locale's -%find_lang %{name} --with-kde ||: +%find_lang konversation --with-kde %check @@ -76,7 +78,7 @@ if [ $1 -eq 0 ] ; then fi -%files -f %{name}.lang +%files -f konversation.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO %{_kde4_bindir}/konversation @@ -88,6 +90,9 @@ fi %changelog +* Sat May 22 2010 Rex Dieter - 1.3-0.1.beta1 +- konversation-1.3-beta1 + * Mon May 10 2010 Rex Dieter - 1.2.3-2.20100510 - 20100510 snapshot diff --git a/sources b/sources index e8f3add..6a48d27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6389e2e8415117c363472ced94bc75f0 konversation-1.2.3-20100510.tar.bz2 +f6bdf13dd392663267a28e873d3e94c8 konversation-1.3-beta1.tar.bz2