rpms/qtparted/devel qtparted-0.4.5-qp_libparted.patch, NONE, 1.1 qtparted.spec, 1.33, 1.34

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/qtparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4802

Modified Files:
	qtparted.spec 
Added Files:
	qtparted-0.4.5-qp_libparted.patch 
Log Message:
- Fix FTBFS: added Debians qtparted-0.4.5-qp_libparted.patch



qtparted-0.4.5-qp_libparted.patch:
 qp_libparted.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qtparted-0.4.5-qp_libparted.patch ---
--- qtparted-0.4.5.orig/src/qp_libparted.cpp
+++ qtparted-0.4.5/src/qp_libparted.cpp
@@ -1748,11 +1748,11 @@
 								label.latin1(),
 								path) != PED_EXCEPTION_IGNORE) goto error_free_path;
 	}
-	ped_free(path);
+	free(path);
 	return true;
 
 error_free_path:
-	ped_free(path);
+	free(path);
 
 //error:
 	return false;


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- qtparted.spec	26 Aug 2009 07:19:08 -0000	1.33
+++ qtparted.spec	11 Sep 2009 23:14:51 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 Group:          Applications/System
 License:        GPLv2
@@ -13,6 +13,10 @@ Source2:        %{name}.consoleapp
 Source3:        %{name}.qtpartedrc
 Patch0:         %{name}-desktop.patch
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -45,6 +49,7 @@ QTParted is a Partition Magic clone writ
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 . %{_sysconfdir}/profile.d/qt.sh
@@ -120,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/qtparted.1*
 
 %changelog
+* Fri Sep 12 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.5-22
+- Fix FTBFS: added Debians qtparted-0.4.5-qp_libparted.patch
+
 * Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.5-21
 - Add explicit requirement on libuuid-devel to fix broken deps in rawhide