- updated

Changed files:
    grub-shelllib.patch -> 1.4
    grub2.spec -> 1.102

diff --git a/grub-shelllib.patch b/grub-shelllib.patch
index f69e3a6e8123a63b0d6f007a7ad1cbccdf46bd18..4b213278b355e9f6bc45ef7292c45d783d6bfe8f 100644 (file)
--- a/grub-shelllib.patch
+++ b/grub-shelllib.patch
@@ -1,3 +1,15 @@
+--- grub-1.99/Makefile.am~     2011-04-16 15:29:09.000000000 +0200
++++ grub-1.99/Makefile.am      2011-09-08 15:18:49.286379677 +0200
+@@ -101,7 +101,8 @@
+ # Install config.h into platformdir
+ platform_HEADERS = config.h
+ 
+-pkglib_DATA += grub-mkconfig_lib
++ulibdir = /lib
++ulib_DATA = grub-mkconfig_lib
+ pkglib_DATA += update-grub_lib
+ 
+ 
 --- grub-1.97.1.shelllib/util/grub.d/00_header.in      2009-11-09 17:48:16.000000000 +0200
 +++ grub-1.97.1/util/grub.d/00_header.in       2009-11-17 12:34:23.164322142 +0200
 @@ -23,7 +23,7 @@
@@ -64,17 +76,6 @@
  
  if [ "x$EUID" = "x" ] ; then
    EUID=`id -u`
---- grub-1.97.1.shelllib/util/grub-install.in  2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub-install.in   2009-11-17 12:34:23.157655729 +0200
-@@ -32,7 +32,7 @@
- pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
- 
- # for make_system_path_relative_to_its_root()
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
- 
- grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
- if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
 --- grub-1.97.1.shelllib/util/update-grub_lib.in       2009-11-09 17:48:16.000000000 +0200
 +++ grub-1.97.1/util/update-grub_lib.in        2009-11-17 12:34:23.157655729 +0200
 @@ -18,6 +18,6 @@
@@ -85,3 +86,14 @@
 +. /lib/grub-mkconfig_lib
  
  grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"
+--- grub-1.99/20_linux_xen~    2011-09-08 15:24:37.000000000 +0200
++++ grub-1.99/20_linux_xen     2011-09-08 15:27:36.171492233 +0200
+@@ -21,7 +21,7 @@
+ exec_prefix=/usr
+ bindir=/sbin
+ libdir=/boot
+-. ${libdir}/grub/grub-mkconfig_lib
++. /lib/grub-mkconfig_lib
+ 
+ export TEXTDOMAIN=grub
+ export TEXTDOMAINDIR=${prefix}/share/locale

diff --git a/grub2.spec b/grub2.spec
index b87523a328734df8d53ef1402f34307ed79dfacf..cf6bd16e818cfc2fbca068f6ed448372ac55d8fe 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -332,9 +332,9 @@ echo "Grub was upgraded, trying to setup it to boot sector"
 %attr(755,root,root) %{_sbindir}/grub-emu
 %{_mandir}/man8/grub-emu.8*
 %endif
+/lib/grub-mkconfig_lib
 
 %dir %{_libexecdir}
-%{_libexecdir}/grub-mkconfig_lib
 # XXX: check this locale dir location and if it is neccesaary to exist on /boot
 %dir %{_libexecdir}/locale
 %config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/grub.cfg