rpms/kdebase/devel kdebase-3.5.4-kde#128552.patch, NONE, 1.1 .cvsignore, 1.50, 1.51 kdebase.spec, 1.210, 1.211 sources, 1.69, 1.70 kdebase-3.5.3-to-3.5.4.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5028

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.4-kde#128552.patch 
Removed Files:
	kdebase-3.5.3-to-3.5.4.patch 
Log Message:
- apply upstream patch to fix kde#128552, kicker regression


kdebase-3.5.4-kde#128552.patch:
 taskbar.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kde#128552.patch ---
Index: kicker/taskbar/taskbar.cpp
===================================================================
--- kicker/taskbar/taskbar.cpp	(Revision 570839)
+++ kicker/taskbar/taskbar.cpp	(Revision 570840)
@@ -177,14 +177,14 @@
 
         if (containerCount() == 0)
         {
-            actualMax = maxSize.height();
+            actualMax = minButtonHeight;
         }
 
         if (actualMax > maxSize.height())
         {
             return maxSize;
         }
-        return QSize( maxSize.width(), maxSize.height() );
+        return QSize( maxSize.width(), actualMax );
     }
     else
     {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	11 Jul 2006 13:13:02 -0000	1.50
+++ .cvsignore	8 Aug 2006 11:47:37 -0000	1.51
@@ -24,3 +24,4 @@
 kdebase-3.5.2.tar.bz2
 kdebase-3.5.3.tar.bz2
 kde-redhat-config-3.5-fc5-0.3.tar.bz2
+kdebase-3.5.4.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- kdebase.spec	8 Aug 2006 09:52:30 -0000	1.210
+++ kdebase.spec	8 Aug 2006 11:47:38 -0000	1.211
@@ -24,8 +24,7 @@
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
@@ -35,9 +34,7 @@
 Source7: mailsettings.cc
 Source8: env.sh
 
-# is really independent of all others and need 0 for 3.5.3->3.5.4 patch
 Patch200: kde-libtool.patch
-Patch0: kdebase-3.5.3-to-3.5.4.patch
 Patch1: kdebase-3.5.4-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
@@ -58,6 +55,7 @@
 
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
+Patch101: kdebase-3.5.4-kde#128552.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -143,8 +141,7 @@
 Kate plugins or KWin styles.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .vroot
 %patch3 -p1 -b .shortcuts
@@ -165,6 +162,7 @@
 
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
+%patch101 -p0 -b .kde#128552
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -536,6 +534,7 @@
 %changelog
 * Tue Aug 08 2006 Than Ngo <than redhat com> 6:3.5.4-1
 - apply upstream patch to fix KDED crashing on startup when D-BUS is unavailable.
+- apply upstream patch to fix kde#128552, kicker regression
 
 * Mon Jul 24 2006 Petr Rockai <prockai redhat com> - 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	11 Jul 2006 13:13:02 -0000	1.69
+++ sources	8 Aug 2006 11:47:38 -0000	1.70
@@ -1,2 +1,2 @@
-9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2
 fcd1283fbdc542b1d484bbb4aa273980  kde-redhat-config-3.5-fc5-0.3.tar.bz2
+882a9729c08b197caef2c8712c980d9c  kdebase-3.5.4.tar.bz2


--- kdebase-3.5.3-to-3.5.4.patch DELETED ---