- PLD merge

[packages/grub2.git] / grub2.spec

diff --git a/grub2.spec b/grub2.spec
index eebec6845e037aa95f1c9edd6f5b97a7def4d24c..41370a7c2a911d1d4220bb28fe83469dfbdc7c90 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -46,7 +46,7 @@ Summary(pl.UTF-8):    GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):  Gerenciador de inicialização GRUB2
 Name:          grub2
 Version:       2.00
-Release:       3
+Release:       6
 License:       GPL v2
 Group:         Base
 Source0:       http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
@@ -65,7 +65,7 @@ Patch7:               %{name}-awk.patch
 Patch8:                posix.patch
 Patch9:                %{name}-gets.patch
 Patch10:       %{name}-fonts_path.patch
-Patch11:       %{name}-tftp_fix.patch
+Patch11:       %{name}-tftp_fixes.patch
 Patch12:       add-vlan-tag-support.patch
 Patch13:       just-say-linux.patch
 Patch14:       add-GRUB-DISABLE-SUBMENU-option.patch
@@ -76,8 +76,14 @@ Patch18:     Issue-separate-DNS-queries-for-ipv4-and-ipv6.patch
 Patch19:       search-for-specific-config-file-for-netboot.patch
 Patch20:       ignore-kernel-symlinks.patch
 Patch21:       choose-preferred-initrd.patch
+Patch22:       %{name}-cfg.patch
+Patch23:       %{name}-freetype_include.patch
+Patch24:       %{name}-efinet_fix.patch
+Patch25:       %{name}-linuxefi.patch
+Patch26:       %{name}-generated_files.patch
 URL:           http://www.gnu.org/software/grub/
 BuildRequires: autoconf >= 2.53
+BuildRequires: autogen
 BuildRequires: automake >= 1:1.11.1-1
 BuildRequires: bison
 BuildRequires: device-mapper-devel
@@ -107,6 +113,7 @@ BuildRequires:      gcc-multilib
 %endif
 %endif
 Requires:      %{name}-platform = %{version}-%{release}
+Requires:      issue
 Requires:      which
 %ifarch %{ix86} %{x8664}
 Suggests:      %{name}-platform-pc
@@ -303,6 +310,11 @@ Motyw starfield dla GRUB-a.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p0
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 # if gold is used then grub doesn't even boot