rpms/mkinitrd/devel mkinitrd-5.1.3-compile-fix.patch, NONE, 1.1 mkinitrd.spec, 1.146, 1.147

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Aug 14 09:24:30 UTC 2006


Author: markmc

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16514

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-5.1.3-compile-fix.patch 
Log Message:
* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
- Fix compile error


mkinitrd-5.1.3-compile-fix.patch:
 util.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mkinitrd-5.1.3-compile-fix.patch ---
--- mkinitrd-5.1.3/nash/util.c.compile-fix	2006-08-07 15:04:14.000000000 -0400
+++ mkinitrd-5.1.3/nash/util.c	2006-08-14 05:21:46.538383000 -0400
@@ -49,7 +49,7 @@
     start = buf;
     end = strchr(start, '\n');
     while (start && end) {
-        size_t off;
+        int off;
         *end++ = '\0';
         if (sscanf(start, "%d %n", &num, &off) &&
                 strncmp(device, start + off, strlen(device)) == 0)


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- mkinitrd.spec	11 Aug 2006 21:09:11 -0000	1.146
+++ mkinitrd.spec	14 Aug 2006 09:24:25 -0000	1.147
@@ -4,12 +4,13 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.1.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 %define BDEVID_VERSION 0.3
 Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
+Patch0: mkinitrd-5.1.3-compile-fix.patch
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -65,6 +66,8 @@
 %setup -q -c -a 0
 %setup -q -c -a 1
 
+%patch0 -p1 -b .compile-fix
+
 %build
 cd mkinitrd-%{version}
 make LIB=%{_lib}
@@ -116,6 +119,9 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
+- Fix compile error
+
 * Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 5.1.3-1
 - replace various sed/grep/cut/head calls with bash & awk equivalents
 - fix a typo




More information about the fedora-cvs-commits mailing list