SPECS (AC-branch): grub.spec - merged patches from head (ac.patch, ...

[marcus]

Author: marcus                       Date: Wed Apr  9 07:30:03 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged patches from head (ac.patch, cciss), rel. 7.

---- Files affected:
SPECS:
   grub.spec (1.102 -> 1.102.2.1) 

---- Diffs:

================================================================
Index: SPECS/grub.spec
diff -u SPECS/grub.spec:1.102 SPECS/grub.spec:1.102.2.1
--- SPECS/grub.spec:1.102	Tue Aug 23 14:01:26 2005
+++ SPECS/grub.spec	Wed Apr  9 09:29:58 2008
@@ -18,7 +18,7 @@
 Summary(de):	GRUB - ein Bootloader für x86
 Name:		grub
 Version:	0.97
-Release:	1
+Release:	2
 License:	GPL
 Group:		Base
 Source0:	ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz
@@ -39,10 +39,12 @@
 Patch8:		%{name}-0.94-diskless-1.patch
 Patch9:		%{name}-0.94-diskless-fixtg3.patch
 Patch10:	%{name}-geometry-26kernel.patch
-Patch11:	%{name}-i2o.patch
+Patch11:	%{name}-cciss-devicemap.patch
 Patch12:	%{name}-initrdmax.patch
 Patch13:	%{name}-gcc4.patch
 Patch14:	%{name}-useless.patch
+Patch15:	%{name}-ac.patch
+Patch16:	%{name}-i2o.patch
 URL:		http://www.gnu.org/software/grub/grub.en.html
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -156,6 +158,8 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 rm -rf doc/*info*
 
@@ -275,6 +279,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102.2.1  2008-04-09 07:29:58  marcus
+- merged patches from head (ac.patch, cciss), rel. 7.
+
 Revision 1.102  2005-08-23 12:01:26  baggins
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/grub.spec?r1=1.102&r2=1.102.2.1&f=u