rpms/kdesdk/F-10 kdesdk.spec,1.124,1.125

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3797

Modified Files:
	kdesdk.spec 
Log Message:
* Thu Feb 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-2
- fix Kompare crash with Qt 4.5 (kde#182792)
- fix build with GCC 4.4



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdesdk.spec	24 Jan 2009 17:54:07 -0000	1.124
+++ kdesdk.spec	20 Feb 2009 14:27:51 -0000	1.125
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,6 +9,12 @@
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 # upstream patches
+# fix Kompare crash with Qt 4.5 (kde#182792)
+# http://websvn.kde.org/?view=rev&revision=924539
+# part of 4.2.1 mass backport: http://websvn.kde.org/?view=rev&revision=928150
+Patch100:       kdesdk-4.2.0-kompare-qt45-crash.patch
+# fix build with GCC 4.4
+Patch101:       kdesdk-4.2.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -82,6 +88,8 @@
 %setup -q
 
 # upstream patches
+%patch100 -p0 -b .kompare-qt45-crash
+%patch101 -p0 -b .gcc44
 
 %build
 mkdir -p %{_target_platform}
@@ -215,6 +223,10 @@
 
 
 %changelog
+* Thu Feb 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-2
+- fix Kompare crash with Qt 4.5 (kde#182792)
+- fix build with GCC 4.4
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0