rpms/aimage/devel aimage-3.2.0-gcc44.patch, NONE, 1.1 aimage.spec, 1.5, 1.6
NicolasChauvet
kwizart at fedoraproject.org
Mon Mar 2 12:47:08 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/aimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1262
Modified Files:
aimage.spec
Added Files:
aimage-3.2.0-gcc44.patch
Log Message:
Fix for gcc44
aimage-3.2.0-gcc44.patch:
--- NEW FILE aimage-3.2.0-gcc44.patch ---
diff -up aimage-3.2.0/src/aimage_os.cpp.gcc44 aimage-3.2.0/src/aimage_os.cpp
--- aimage-3.2.0/src/aimage_os.cpp.gcc44 2009-03-02 13:36:09.000000000 +0100
+++ aimage-3.2.0/src/aimage_os.cpp 2009-03-02 13:41:32.000000000 +0100
@@ -33,11 +33,15 @@ void checkline(const char *name,const ch
{
while(buf[0] && isspace(buf[0])) buf++; // advance buf to end of spaces
- char *pos = strstr(buf,name);
+ char *buf_tmp;
+ char *name_tmp;
+ strcpy(buf_tmp, buf);
+ strcpy(name_tmp, name);
+ char *pos = strstr(buf_tmp,name_tmp);
if(pos==0) return;
/* The string was found */
- char *cc = pos + strlen(name); // skip past to the end of the string
+ char *cc = pos + strlen(name_tmp); // skip past to the end of the string
while(*cc && isspace(*cc)) cc++; // scan to end of spaces
char *dd = index(cc,'\n'); // can we find a \n?
if(dd) *dd = '\000'; // yes; clear it
Index: aimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aimage.spec 24 Feb 2009 00:22:04 -0000 1.5
+++ aimage.spec 2 Mar 2009 12:46:37 -0000 1.6
@@ -1,12 +1,13 @@
Name: aimage
Version: 3.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Advanced Disk Imager
Group: Applications/System
License: BSD with advertising
URL: http://www.afflib.org
Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz
+Patch0: aimage-3.2.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: afflib-devel
@@ -19,6 +20,7 @@
%prep
%setup -q
+%patch0 -p1 -b .gcc44
%build
@@ -42,6 +44,9 @@
%changelog
+* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.2.0-4
+- Fix for gcc44
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list