[qtparted] Patch for "Cannot get parted version" bug (#585263).

[Steven Pritchard]

commit 44a196edfaa65f55e744b2d682fa28e8ffb038a9
Author: Steven Pritchard <steven.pritchard at gmail.com>
Date:   Wed Oct 27 09:25:40 2010 -0500

    Patch for "Cannot get parted version" bug (#585263).

 qtparted-0.4.5-parted-version.patch |   35 +++++++++++++++++++++++++++++++++++
 qtparted.spec                       |   11 +++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/qtparted-0.4.5-parted-version.patch b/qtparted-0.4.5-parted-version.patch
new file mode 100644
index 0000000..5662851
--- /dev/null
+++ b/qtparted-0.4.5-parted-version.patch
@@ -0,0 +1,35 @@
+--- trunk/qtparted/src/qp_libparted.cpp	2010/06/18 23:27:46	250
++++ trunk/qtparted/src/qp_libparted.cpp	2010/06/18 23:35:23	252
+@@ -656,16 +656,27 @@
+     int major, minor, micro;
+     const char *version;
+ 
+-    if ( ! ( version = ped_get_version () ) || ( sscanf ( version, "%d.%d.%d", &major, &minor, &micro ) != 3 ) )
++    if ( ! ( version = ped_get_version () ) ) //|| ( sscanf ( version, "%d.%d.%d", &major, &minor, &micro ) != 3 ) )
+     {
+-        printf ( "Cannot get parted version\n" );
+-        QString label = QString ( QObject::tr ( "Cannot get parted version." ) );
+-        QMessageBox::information ( NULL, PROG_NAME, label );
+-        showDebug ( "%s", "Cannot get parted version\n" );
++	printf ( "Cannot get parted version\n" );
++	QString label = QString ( QObject::tr ( "Cannot get parted version." ) );
++	QMessageBox::information ( 0, PROG_NAME, label );
++	showDebug ( "%s", "Cannot get parted version\n" );
+ 
+         return false;
+     }
+ 
++    if(sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++	micro = 0;
++	if(sscanf(version, "%d.%d", &major, &minor) != 2) {
++		minor = 0;
++		if(sscanf(version, "%d", &major) != 1) {
++			QMessageBox::information(0, PROG_NAME, tr("Can't identify parted version; claims to be %1").arg(version));
++			return false;
++		}
++	}
++    }
++
+     if ( ( major > PARTED_REQUESTED_MAJOR ) ||
+             ( ( major == PARTED_REQUESTED_MAJOR ) && ( minor > PARTED_REQUESTED_MINOR ) ) ||
+             ( ( major == PARTED_REQUESTED_MAJOR ) && ( minor == PARTED_REQUESTED_MINOR )
diff --git a/qtparted.spec b/qtparted.spec
index b9c063f..3400afa 100644
--- a/qtparted.spec
+++ b/qtparted.spec
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 Group:          Applications/System
 License:        GPLv2
@@ -16,7 +16,10 @@ Patch1:         qtparted-0.4.5-PED_SECTOR_SIZE.patch
 # From http://patch-tracker.debian.org/patch/misc/view/qtparted/0.4.5-5/src/qp_libparted.cpp
 # Filed into upstreams bugtracker at:
 # http://sourceforge.net/tracker/?func=detail&aid=2857251&group_id=72497&atid=534714
-Patch2:			qtparted-0.4.5-qp_libparted.patch
+Patch2:         qtparted-0.4.5-qp_libparted.patch
+# http://qtparted.svn.sourceforge.net/viewvc/qtparted/trunk/qtparted/src/qp_libparted.cpp?view=patch&r1=250&r2=252&pathrev=252
+# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=585263
+Patch3:         qtparted-0.4.5-parted-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -50,6 +53,7 @@ QTParted is a Partition Magic clone written in C++ using the Qt toolkit.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p2
 
 %build
 . %{_sysconfdir}/profile.d/qt.sh
@@ -125,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/qtparted.1*
 
 %changelog
+* Wed Oct 27 2010 Steven Pritchard <steve at kspei.com> 0.4.5-25
+- Patch for "Cannot get parted version" bug (#585263).
+
 * Fri Apr 02 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.4.5-24
 - Rebuild for new parted (2.2)