rpms/partimage/devel partimage-0.6.7-gcc44.patch, NONE, 1.1 import.log, 1.1, 1.2 partimage.spec, 1.2, 1.3

[Paulo Roma Cavalcanti]

Author: roma

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

Modified Files:
	import.log partimage.spec 
Added Files:
	partimage-0.6.7-gcc44.patch 
Log Message:
Patched for gcc 4.4


partimage-0.6.7-gcc44.patch:

--- NEW FILE partimage-0.6.7-gcc44.patch ---
diff -Naur partimage-0.6.7/src/client/misc.cpp partimage-0.6.7-new/src/client/misc.cpp
--- partimage-0.6.7/src/client/misc.cpp	2008-02-03 19:58:00.000000000 -0200
+++ partimage-0.6.7-new/src/client/misc.cpp	2009-02-26 12:57:45.000000000 -0300
@@ -2372,7 +2372,7 @@
 
 static char *sfdisk_line_to_partition_device(const char *line)
 {
-  if (char *p = strchr(line, ':')) {
+  if (const char *p = strchr(line, ':')) {
     while (p[-1] == ' ' && p > line) p--;
     return strndup(line, p - line);
   } else {


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Dec 2008 01:19:12 -0000	1.1
+++ import.log	26 Feb 2009 16:44:01 -0000	1.2
@@ -1 +1,2 @@
 partimage-0_6_7-5_fc8:HEAD:partimage-0.6.7-5.fc8.src.rpm:1228353414
+partimage-0_6_7-6_fc11:HEAD:partimage-0.6.7-6.fc11.src.rpm:1235666598


Index: partimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/devel/partimage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- partimage.spec	26 Feb 2009 09:55:52 -0000	1.2
+++ partimage.spec	26 Feb 2009 16:44:02 -0000	1.3
@@ -23,6 +23,7 @@
 Source3: README.partimage.html
 # Changes include <iostream.h> for include <iostream> (gcc-c++ 4.3)
 Patch0:  partimage-0.6.7-gcc43.patch
+Patch1:  partimage-0.6.7-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: autoconf 
@@ -68,6 +69,7 @@
 %prep
 %setup -q -a1 -a2
 %patch0 -p1 -b .gcc43
+%patch1 -p1 -b .gcc44
 for i in ./TODO ./README ./ChangeLog ./THANKS ./README.partimaged; do
         iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
         mv "${i}_" "$i"
@@ -221,8 +223,8 @@
 %dir %{image_place}
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Feb 26 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.6.7-6
+- Patched for gcc-4.4.
 
 * Mon Dec 02 2008 Paulo Roma <roma at lcg.ufrj.br> - 0.6.7-5
 - Owning %%{_datadir}/partimaged.