From ca7499048de755a22100f10822f92ddaa3ad6e4a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Wed, 27 Aug 2008 09:06:33 +0000
Subject: [PATCH] - Updated SVN snapshot - Added huge fat warnings

---
 README.Fedora | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 grub2.spec    | 23 +++++++++++++++++----
 sources       |  2 +-
 3 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 README.Fedora

diff --git a/README.Fedora b/README.Fedora
new file mode 100644
index 00000000..69dc7f52
--- /dev/null
+++ b/README.Fedora
@@ -0,0 +1,56 @@
+Using GNU GRUB 2 in Fedora
+==========================
+
+Though GRUB 2 provides various feature enhancements over previous GRUB
+version (referred to as "GRUB", or "GRUB Legacy"), it did not reach its
+stability and feature completness yet, and thus is not ready to replace
+it for the whole user base. This package is primarily intended to
+encourage testing and accelerate distribution integration.
+
+It is generally safe to install the package. It is able to co-exist with
+existing GRUB installation and adds itself to the GRUB menu upon
+installation, so you'll able to select GRUB 2 from GRUB menu during
+the boot.
+
+Utilities
+---------
+
+The GRUB 2 utilities are prefixed (or postfixed) with 'grub2':
+
+grub2-editenv
+grub2-mkimage
+grub2-mkelfimage
+grub2-mkrescue
+grub2-pe2elf
+grub2-emu
+grub2-install
+grub2-mkdevicemap
+grub2-probe
+grub2-setup
+update-grub2
+
+Documentation
+-------------
+
+The GRUB 2 lacks documentation. While you are encouraged to contribute
+the documentation, you can use the GRUB 2 Wiki [1] as primary source of
+information pertaining to this development snapshot.
+
+[1] http://grub.enbug.org/
+
+If you intend to install grub2 as your primary boot loader refer to
+the GRUB 2 Wiki for information on how to set it up.
+
+Support channels
+----------------
+
+If you find a bug in this package, report them to the Red Hat Bugzilla [2].
+For talk about using grub2, use IRC channel #grub on freenode Network [3].
+You can meet this package maintainer there (nick lkundrak).
+
+[2] http://bugzilla.redhat.com/
+[3] http://freenode.net/
+
+--
+Lubomir Rintel <lkundrak@v3.sk>
+Fedora Project
diff --git a/grub2.spec b/grub2.spec
index b51f20e3..a0760456 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -38,18 +38,19 @@
 
 Name:           grub2
 Version:        1.98
-Release:        0.2.20080807svn%{?dist}
+Release:        0.3.20080827svn%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
 License:        GPLv3+
 URL:            http://www.gnu.org/software/grub/
 #Source0:        http://alpha.gnu.org/pub/gnu/grub/grub-%{version}.tar.gz
-# svn -r1797 co svn://svn.sv.gnu.org/grub/trunk/grub2
+# svn -r1829 co svn://svn.sv.gnu.org/grub/trunk/grub2
 # tar czf grub2.tar.gz --exclude .svn grub2
 Source0:        grub2.tar.gz
 Source1:        90_persistent
 Source2:        grub.default
+Source3:        README.Fedora
 Patch1:         grub-1.98-prototypes.patch
 Patch2:         grub-1.98-transform.patch
 Patch4:         grub-1.95-grubdir.patch
@@ -81,6 +82,12 @@ a highly configurable and customizable bootloader with modular
 architecture.  It support rich scale of kernel formats, file systems,
 computer architectures and hardware devices.
 
+PLEASE NOTE: This is a development snapshot, and as such will not
+replace grub if you install it, but will be merely added as another
+kernel to your existing GRUB menu. Do not replace GRUB (grub package)
+with it unless you know what are you doing. Refer to README.Fedora
+file that is part of this package's documentation for more information.
+
 
 %prep
 %setup -q -n grub2
@@ -91,11 +98,14 @@ computer architectures and hardware devices.
 %patch5 -p1 -b .os
 %patch6 -p1 -b .cfgmode
 %patch7 -p1 -b .garbage
-%patch8 -p1 -b .persistent
+%patch8 -F2 -p1 -b .persistent
 %patch9 -p0 -b .linuxsort
 %patch10 -p1 -b .dlsym
 %patch13 -p1 -b .preserve-symbols
 
+# README.Fedora
+cp %{SOURCE3} .
+
 
 %build
 # -static is needed so that autoconf script is able to link
@@ -199,6 +209,7 @@ update-%{name}
 %{_sbindir}/%{name}-setup
 %{_sbindir}/update-%{name}
 %{_bindir}/%{name}-mkimage
+%{_bindir}/%{name}-mkelfimage
 %{_bindir}/%{name}-mkrescue
 %{_bindir}/%{name}-editenv
 %{_bindir}/%{name}-pe2elf
@@ -211,11 +222,15 @@ update-%{name}
 # Actually, this is replaced by update-grub from scriptlets,
 # but it takes care of modified persistent part
 %config(noreplace) /boot/%{name}/grub.cfg
-%doc COPYING INSTALL NEWS README THANKS TODO ChangeLog
+%doc COPYING INSTALL NEWS README THANKS TODO ChangeLog README.Fedora
 %exclude %{_mandir}
 
 
 %changelog
+* Wed Aug 27 2008 Lubomir Rintel <lkundrak@v3.sk> - 1.98-0.3.20080827svn
+- Updated SVN snapshot
+- Added huge fat warnings
+
 * Fri Aug 08 2008 Lubomir Rintel <lkundrak@v3.sk> - 1.98-0.2.20080807svn
 - Correct scriptlet dependencies, trigger on kernel-PAE (thanks to Till Maas)
 - Fix build on x86_64 (thanks to Marek Mahut)
diff --git a/sources b/sources
index 75eaf926..ba8ca283 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e900ada389acd04b579583cb2179ef61  grub2.tar.gz
+27ca6fe1350ec41ed79e31a404c055fb  grub2.tar.gz