rpms/grub/devel grub.spec,1.54,1.55

Peter Jones (pjones) fedora-extras-commits at redhat.com
Tue Aug 7 15:18:18 UTC 2007


Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25918

Modified Files:
	grub.spec 
Log Message:
Move to tarball + git-diff generated patch.



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- grub.spec	23 Jul 2007 17:38:32 -0000	1.54
+++ grub.spec	7 Aug 2007 15:17:45 -0000	1.55
@@ -1,114 +1,9 @@
 Name: grub
 Version: 0.97
-Release: 15
+Release: 16
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
-URL: http://www.gnu.org/software/%{name}/
-Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-# let's have some sort of organization for the patches
-# patches 0-19 are for config file related changes (menu.lst->grub.conf)
-Patch0: grub-0.93-configfile.patch
-Patch1: grub-0.90-symlinkmenulst.patch
-
-# patches 20-39 are for grub-install bits
-Patch20: grub-0.97-install.in.patch
-Patch21: grub-0.94-installcopyonly.patch
-Patch22: grub-0.94-addsyncs.patch
-
-# patches 40-59 are for miscellaneous build related patches
-# link against curses statically
-Patch40: grub-0.95-staticcurses.patch
-
-# patches submitted upstream and pending approval
-# change the message so that how to accept changes is clearer (#53846)
-Patch81: grub-0.93-endedit.patch
-
-# patches 100-199 are for features proposed but not accepted upstream
-# add support for appending kernel arguments
-Patch100: grub-0.90-append.patch
-# add support for lilo -R-esque select a new os to boot into
-Patch101: grub-0.97-once.patch
-
-# patches 200-299 are for graphics mode related patches
-Patch200: grub-0.95-graphics.patch
-Patch201: grub-0.91-splashimagehelp.patch
-Patch202: grub-0.93-graphics-bootterm.patch
-Patch203: grub-0.95-hiddenmenu-tweak.patch
-
-# patches 500+ are for miscellaneous little things
-# support for non-std devs (eg cciss, etc)
-Patch500: grub-0.93-special-device-names.patch
-# i2o device support
-Patch501: grub-0.94-i2o.patch
-# detect cciss/ida/i2o
-Patch502: grub-0.95-moreraid.patch
-
-# for some reason, using the initrd max part of the setup.S structure
-# causes problems on x86_64 and with 4G/4G
-Patch505: grub-0.94-initrdmax.patch
-
-# we need to use O_DIRECT to avoid hitting oddities with caching
-Patch800: grub-0.95-odirect.patch
-
-# the 2.6 kernel no longer does geometry fixups.  so now I get to do it
-# instead in userspace everywhere.  
-Patch1000: grub-0.95-geometry-26kernel.patch
-
-# Support for booting from a RAID1 device
-Patch1100: grub-0.95-md.patch
-Patch1101: grub-0.95-md-rework.patch
-
-# Ignore everything before the XPM header in the bootsplash
-Patch1102: grub-0.95-xpmjunk.patch
-
-# Don't go to "graphics" mode unless we find the bootsplash and it's an xpm,
-# and don't print any errors about the missing file while current_term is
-# "graphics".
-Patch1103: grub-0.95-splash-error-term.patch
-
-# Mark the simulation stack executable
-Patch1104: grub-0.97-nxstack.patch
-Patch1105: grub-0.97-nx-multiinstall.patch
-
-# always use a full path for mdadm.
-Patch1110: grub-0.97-mdadm-path.patch
-# always install into the mbr if we're on a raid1 /boot.
-Patch1111: grub-0.95-md-mbr.patch
-
-# gcc4 fixes.
-Patch1115: grub-0.97-gcc4.patch
-
-# Make non-MBR installs work again on non-raid1.
-Patch1120: grub-0.95-nonmbr.patch
-
-# Make "grub-install --recheck" look like the menace it is.
-Patch1130: grub-0.95-recheck-bad.patch
-
-# Fix missing prototypes, since grub nicely sets -Wmissing-prototypes and
-# then tries to build conftests without them.
-Patch1135: grub-0.97-prototypes.patch
-
-# put /usr/lib/grub back in /usr/share/grub like it was before, so other
-# scripts don't screw up.
-Patch1140: grub-0.97-datadir.patch
-
-# install correctly on dmraid devices
-Patch1145: grub-0.97-dmraid.patch
-Patch1146: grub-0.97-dmraid-recheck-bad.patch
-Patch1147: grub-0.97-dmraid-partition-names.patch
-
-# fix mactel keyboard bugs
-Patch1148: grub-0.97-mactel-kbd.patch
-
-# fix error reporting
-Patch1149: grub-0.97-stderr.patch
-
-# fix grub-install to notice mpath partitions
-Patch1150: grub-0.97-mpath.patch
-
-# support booting from gpt
-Patch1151: grub-0.96-gpt_partition_support.patch
 
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
@@ -119,6 +14,10 @@
 Requires: system-logos
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+URL: http://www.gnu.org/software/%{name}/
+Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Patch0: grub-fedora-8.patch
+
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
 capable of booting into most free operating systems - Linux, FreeBSD,
@@ -127,70 +26,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
-%patch1 -p1 -b .menulst
-
-%patch20 -p1 -b .install
-%patch21 -p1 -b .copyonly
-%patch22 -p1 -b .addsync
-
-%patch40 -p1 -b .static
-
-%patch81 -p0 -b .endedit
-
-%patch100 -p1 -b .append
-%patch101 -p1 -b .bootonce
-
-%patch200 -p1 -b .graphics
-%patch201 -p1 -b .splashhelp
-%patch202 -p1 -b .bootterm
-%patch203 -p1 -b .hidden
-
-%patch500 -p1 -b .raid
-%patch501 -p1 -b .i2o
-%patch502 -p1 -b .moreraid
-
-# This patch fixes #116311 .
-%patch505 -p1 -b .initrdmax
-
-%patch800 -p1 -b .odirect
-
-%patch1000 -p1 -b .26geom
-
-%patch1100 -p1 -b .md
-%patch1101 -p1 -b .md-rework
-
-%patch1102 -p1 -b .xpmjunk
-
-%patch1103 -p1 -b .splash-error-term
-
-%patch1104 -p1 -b .nxstack
-%patch1105 -p1 -b .nx-multiinstall
-
-%patch1110 -p1 -b .mdadm-path
-%patch1111 -p1 -b .md-mbr
-
-%patch1115 -p1 -b .gcc4
-
-%patch1120 -p1 -b .nonmbr
-
-%patch1130 -p1 -b .recheck-bad
-
-%patch1135 -p1 -b .prototypes
-
-%patch1140 -p1 -b .datadir
-
-%patch1145 -p1 -b .dmraid
-%patch1146 -p1 -b .dmraid-recheck-bad
-%patch1147 -p1 -b .dmraid-partition-names
-
-%patch1148 -p1 -b .mactel-kbd
-
-%patch1149 -p1 -b .stderr
-
-%patch1150 -p1 -b .mpath
-
-%patch1151 -p1 -b .gpt
+%patch -p1 -b .fedora-8
 
 %build
 autoconf
@@ -203,7 +39,7 @@
 CFLAGS="$CFLAGS -static" 
 %endif
 export CFLAGS
-%configure --sbindir=/sbin --disable-auto-linux-mem-opt
+%configure --sbindir=/sbin --disable-auto-linux-mem-opt --datarootdir=%{_datadir}
 make
 
 %install
@@ -243,6 +79,11 @@
 %{_datadir}/grub
 
 %changelog
+* Tue Aug 7 2007 Peter Jones <pjones at redhat.com> - 0.97-16
+- Add ext[23] large inode support (patch from Eric Sandeen)
+- Fix auto* breakage that happened when we switched from autoreconf to autoconf
+- Move to original tarball + patch generated from git
+
 * Mon Jul 16 2007 Peter Jones <pjones at redhat.com> - 0.97-15
 - Support booting from GPT
 




More information about the fedora-extras-commits mailing list