rpms/kpackagekit/F-12 kpackagekit-0.5.2-crash.patch, NONE, 1.1 kpackagekit.spec, 1.51, 1.52

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1711

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.5.2-crash.patch 
Log Message:
* Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.2-3
- backport crash fix


kpackagekit-0.5.2-crash.patch:
 KpkPackageModel.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kpackagekit-0.5.2-crash.patch ---
diff -up kpackagekit-0.5.2/libkpackagekit/KpkPackageModel.cpp.crash kpackagekit-0.5.2/libkpackagekit/KpkPackageModel.cpp
--- kpackagekit-0.5.2/libkpackagekit/KpkPackageModel.cpp.crash	2009-12-07 13:54:32.000000000 -0600
+++ kpackagekit-0.5.2/libkpackagekit/KpkPackageModel.cpp	2010-01-11 13:12:32.363621832 -0600
@@ -168,6 +168,9 @@ int KpkPackageModel::rowCount(const QMod
 
 QModelIndex KpkPackageModel::index(int row, int column, const QModelIndex &parent) const
 {
+    if (row <= 0)
+        return QModelIndex();
+
     Package *pkg;
     // not grouped and parent invalid
     // means a normal package


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- kpackagekit.spec	11 Dec 2009 00:00:53 -0000	1.51
+++ kpackagekit.spec	11 Jan 2010 20:24:08 -0000	1.52
@@ -1,9 +1,9 @@
 
-%define pk_version 0.5.5
+%define pk_min_version 0.5.5
 
 Name:	  	kpackagekit
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -15,15 +15,18 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 #Hacks to smash kpackagekit: daily/none default (#469375)
 Patch50: kpackagekit-0.5.1-defaults_hacks.patch
+# backport http://websvn.kde.org?view=revision&revision=1073079
+Patch51: kpackagekit-0.5.2-crash.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:	kde-filesystem
 BuildRequires:	kdelibs4-devel
-BuildRequires:	PackageKit-qt-devel >= %{pk_version} 
+BuildRequires:	PackageKit-qt-devel >= %{pk_min_version} 
 BuildRequires:  gettext
 BuildRequires:  dbus-qt-devel
 
+%global pk_version %(pkg-config --modversion packagekit-qt 2> /dev/null || echo %{pk_min_version})
 Requires: PackageKit-qt >= %{pk_version}
 
 %description
@@ -34,6 +37,7 @@ KDE interface for PackageKit.
 %setup -q -n %{name}-%{version}
 
 %patch50  -p1 -b .defaults_hacks
+%patch51 -p1 -b .crash
 
 %build
 mkdir -p %{_target_platform}
@@ -76,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 
 %changelog
+* Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.2-3
+- backport crash fix
+
 * Thu Dec 10 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2-2
 - Clean up spec file