rpms/kdelibs/devel kdelibs-3.5.8-kde#150944.patch, NONE, 1.1 kdelibs.spec, 1.239, 1.240

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19116

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.8-kde#150944.patch 
Log Message:
* Tue Oct 23 2007 Than Ngo <than at redhat.com> - 3.5.8-6
- Resolves: rh#335461, kpdf and kview lost custom zoom


kdelibs-3.5.8-kde#150944.patch:

--- NEW FILE kdelibs-3.5.8-kde#150944.patch ---
--- branches/KDE/3.5/kdelibs/kdeui/kactionclasses.cpp	2007/08/30 19:30:39	706570
+++ branches/KDE/3.5/kdelibs/kdeui/kactionclasses.cpp	2007/10/20 20:49:01	727528
@@ -667,8 +667,8 @@
     KToolBar* bar = static_cast<KToolBar*>( widget );
     int id_ = KAction::getToolButtonID();
     bar->insertCombo( comboItems(), id_, isEditable(),
-                      SIGNAL( activated( int ) ), this,
-                      SLOT( slotActivated( int ) ), isEnabled(),
+                      SIGNAL( activated( const QString & ) ), this,
+                      SLOT( slotActivated( const QString & ) ), isEnabled(),
                       toolTip(), -1, index );
 
     QComboBox *cb = bar->getCombo( id_ );


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- kdelibs.spec	18 Oct 2007 17:38:59 -0000	1.239
+++ kdelibs.spec	25 Oct 2007 13:35:51 -0000	1.240
@@ -6,7 +6,7 @@
 
 %define arts 1
 %define arts_epoch 8
-%define arts_version 1.5.7
+%define arts_version 1.5.8
 
 %define qt_epoch 1
 %define qt_version 3.3.8
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -73,7 +73,7 @@
 
 ## upstream patches
 Patch200: kdelibs-3.5.8-http-regression.patch
-
+Patch201: kdelibs-3.5.8-kde#150944.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -140,7 +140,7 @@
 %endif
 BuildRequires: findutils
 BuildRequires: jasper-devel
-BuildRequires: OpenEXR-devel >= 1.6.0
+BuildRequires: OpenEXR-devel
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
@@ -171,9 +171,8 @@
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
-%if 0%{?fedora} > 7
-## those below can/should be omitted from future builds -- Rex
-%else
+## those below can/should be omitted from future(f8?) builds -- Rex
+%if 0
 Requires: bzip2-devel
 Requires: libacl-devel
 Requires: libart_lgpl-devel
@@ -232,6 +231,7 @@
 
 # upstream patches
 %patch200 -p0 -b .http-regression
+%patch201 -p0 -b .kde#150944
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -515,6 +515,9 @@
 
 
 %changelog
+* Tue Oct 23 2007 Than Ngo <than at redhat.com> - 3.5.8-6
+- Resolves: rh#335461, kpdf and kview lost custom zoom
+
 * Thu Oct 18 2007 Than Ngo <than at redhat.com> - 3.5.8-5
 - bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH