[arch-commits] Commit in grub2/trunk (PKGBUILD)

[Ronald van Haren]

    Date: Sunday, June 17, 2012 @ 12:44:47
  Author: ronald
Revision: 161964

upgpkg: grub2 1:2.00beta6-1

update to 2.00beta6

Modified:
  grub2/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-17 15:31:49 UTC (rev 161963)
+++ PKGBUILD	2012-06-17 16:44:47 UTC (rev 161964)
@@ -2,7 +2,7 @@
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
 _grub_bzr_rev="4232"
-_pkgver="2.00~beta4"
+_pkgver="2.00~beta6"
 
 _grub_lua_ver=24
 _grub_gpxe_ver=12
@@ -11,7 +11,7 @@
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta4
+pkgver=2.00beta6
 pkgrel=1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
@@ -29,15 +29,14 @@
         'archlinux_grub_mkconfig_fixes.patch'
         'grub.default'
         'grub.cfg'
-        '20_memtest86+'
-        'grub-install.fix')
+        '20_memtest86+')
 
 noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
            "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
            "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
            "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
 
-sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
+sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb'
           '89290031b974780c6df76893836d2477d4add895'
           'b04994c005910b4bf123f034b30109d5c8d6fd86'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
@@ -45,8 +44,8 @@
           '26e4e946190bea1f03632658cf08ba90e11dec57'
           'a76b251b110c9c2d49d2340e4ae932db13ad75bd'
           'fd422806c87905f9cabe1f0dc13e544e5fc09e53'
-          'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
-          '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
+          'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
+
 _build_grub2-common_and_bios() {
 
 	## copy the source for building the common/bios package
@@ -57,10 +56,6 @@
 	patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch"
 	echo
 
-	## upstream grub-install fix 
-	## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html
-	patch -Np0 -i "${srcdir}/grub-install.fix"
-	
 	## add the grub-extra sources
 	export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/"
 	install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras"