X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=grub2.spec;h=e51136d96286bdddfa1a9566c02213e6f4cd55a1;hb=9904b7cf2f29d452e4423d0224ee8a7a95f865c8;hp=2a522dbe7b2ec3ec8d89a6a747ef722bc152a9d7;hpb=527a2e1a7941f38d0888e42bf4d3ece948f8da03;p=packages%2Fgrub2.git

diff --git a/grub2.spec b/grub2.spec
index 2a522db..e51136d 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -30,38 +30,41 @@
 %define		platforms %{?with_efi:efi} %{?with_pc:pc}
 %endif
 
+%define		rel	1
 Summary:	GRand Unified Bootloader
 Summary(de.UTF-8):	GRUB2 - ein Bootloader für x86
 Summary(hu.UTF-8):	GRUB2 - rendszerbetöltő x86 gépekhez
 Summary(pl.UTF-8):	GRUB2 - bootloader dla x86
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
-%define	beta	beta2
+%define	beta	rc1
 Name:		grub2
 Version:	2.02
-Release:	0.%{beta}.2
+Release:	0.%{beta}.%{rel}
 License:	GPL v2
 Group:		Base
 # 1. Download and unpack latest official beta snapshot from http://git.savannah.gnu.org/cgit/grub.git
 # 2. Run ./autogen.sh and ./linguas.sh
 # 3. Recompress and upload to DF
 Source0:	grub-%{version}-%{beta}.tar.xz
-# Source0-md5:	f262e61eba2e76a6f60b39a810814284
+# Source0-md5:	32d45aa5ea17b7fc895d2b493f7dc0ee
 Source1:	update-grub
 Source2:	update-grub.8
 Source3:	grub.sysconfig
 Source4:	grub-custom.cfg
-Patch1:		pld-sysconfdir.patch
+Patch1:		tld-sysconfdir.patch
 Patch2:		grub-garbage.patch
 Patch3:		grub-lvmdevice.patch
-Patch4:		pld-mkconfigdir.patch
+Patch4:		tld-mkconfigdir.patch
 Patch5:		grub-mkconfig-diagnostics.patch
 Patch6:		posix.patch
 Patch7:		%{name}-fonts_path.patch
 Patch8:		add-vlan-tag-support.patch
 Patch9:		just-say-linux.patch
 Patch10:	ignore-kernel-symlinks.patch
-Patch11:	choose-preferred-initrd.patch
+Patch11:	initrd-search.patch
 Patch12:	%{name}-cfg.patch
+Patch13:	efi-net-fix.patch
+Patch14:	blscfg.patch
 URL:		http://www.gnu.org/software/grub/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.11.1-1
@@ -71,7 +74,8 @@ BuildRequires:	flex >= 2.5.35
 BuildRequires:	fonts-TTF-DejaVu
 BuildRequires:	freetype-devel >= 2
 BuildRequires:	gawk
-BuildRequires:	gettext-devel
+BuildRequires:	gcc >= 5:3.4
+BuildRequires:	gettext-tools
 BuildRequires:	glibc-localedb-all
 BuildRequires:	glibc-static
 BuildRequires:	help2man
@@ -89,12 +93,8 @@ BuildRequires:	xz
 BuildRequires:	xz-devel
 %ifarch %{x8664}
 BuildRequires:	/usr/lib/libc.so
-%if "%{pld_release}" == "ac"
-BuildRequires:	libgcc32
-%else
 BuildRequires:	gcc-multilib
 %endif
-%endif
 Requires:	%{name}-platform = %{version}-%{release}
 Requires:	issue
 Requires:	which
@@ -283,7 +283,9 @@ Motyw starfield dla GRUB-a.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p0
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 # we don't have C.utf-8 and need an UTF-8 locale for build
 sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules*
@@ -293,13 +295,13 @@ sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules*
 # https://savannah.gnu.org/bugs/?34539
 # http://sourceware.org/bugzilla/show_bug.cgi?id=14196
 install -d our-ld
-ln -s /usr/bin/ld.bfd our-ld/ld
+ln -f -s /usr/bin/ld.bfd our-ld/ld
 export PATH=$(pwd)/our-ld:$PATH
 
 ## not only the typicall autotools stuff
 #./autogen.sh
 
-%{__gettextize}
+#{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -315,7 +317,7 @@ for platform in %{platforms} ; do
 		platform_opts=""
 	fi
 
-	ln -s ../configure .
+	ln -f -s ../configure .
 	# mawk stalls at ./genmoddep.awk, so force gawk
 	AWK=gawk \
 	%configure \
@@ -414,7 +416,7 @@ fi
 
 %files -f grub.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%doc AUTHORS NEWS README THANKS TODO
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub
 %attr(755,root,root) %{_sbindir}/grub-editenv
 %attr(755,root,root) %{_sbindir}/grub-fstest
@@ -455,7 +457,6 @@ fi
 %{_mandir}/man1/grub-fstest.1*
 %{_mandir}/man1/grub-glue-efi.1*
 %{_mandir}/man1/grub-kbdcomp.1*
-%{_mandir}/man1/grub-macbless.1*
 %{_mandir}/man1/grub-menulst2cfg.1*
 %{_mandir}/man1/grub-mklayout.1*
 %{_mandir}/man1/grub-mknetdir.1*
@@ -468,6 +469,7 @@ fi
 %{_mandir}/man1/grub-script-check.1*
 %{_mandir}/man1/grub-syslinux2cfg.1*
 %{_mandir}/man8/grub-install.8*
+%{_mandir}/man8/grub-macbless.8*
 %{_mandir}/man8/grub-mkconfig.8*
 %{_mandir}/man8/grub-ofpathname.8*
 %{_mandir}/man8/grub-reboot.8*
@@ -534,6 +536,14 @@ fi
 %{_libexecdir}/*-pc/efiemu*.o
 %endif
 %{_libexecdir}/*-pc/kernel.img
+%ifarch %{ix86} %{x8664}
+%{_libexecdir}/*-pc/boot.img
+%{_libexecdir}/*-pc/boot_hybrid.img
+%{_libexecdir}/*-pc/cdboot.img
+%{_libexecdir}/*-pc/diskboot.img
+%{_libexecdir}/*-pc/lnxboot.img
+%{_libexecdir}/*-pc/pxeboot.img
+%endif
 %endif
 
 %if %{with efi}