X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=grub2.spec;h=b1cb292f9c67b6b670e776b92ff8fc3e0f0f8cbf;hp=a3c267f988dad9c7561c5150a434ae40e9f0c5d5;hb=9d17de0887ee48f66be4e47be43f8fc6a4ea7799;hpb=3a8be31c695692a1764fe639ae96595d0effa6b0

diff --git a/grub2.spec b/grub2.spec
index a3c267f..b1cb292 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -16,7 +16,7 @@
 %ifnarch %{ix86} %{x8664}
 %undefine	with_pc
 %endif
-%ifnarch %{ix86} %{x8664} ia64
+%ifnarch %{ix86} %{x8664}
 %undefine	with_efi
 %endif
 
@@ -26,42 +26,31 @@
 %endif
 
 # the 'most natural' platform should go last
-%ifarch %{ix86} %{x8664} ia64
+%ifarch %{ix86} %{x8664}
 %define		platforms %{?with_efi:efi} %{?with_pc:pc}
 %endif
-%ifarch ppc ppc64 sparc64
-%define		platforms ieee1275
-%endif
-%ifarch mips
-%define		platforms arc
-%endif
-%ifarch mipsel
-%define		platforms loongson
-%endif
 
+%define		rel	6
 Summary:	GRand Unified Bootloader
-Summary(de.UTF-8):	GRUB2 - ein Bootloader für x86 und ppc
-Summary(hu.UTF-8):	GRUB2 - rendszerbetöltő x86 és ppc gépekhez
-Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
+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
 Name:		grub2
 Version:	2.02
-Release:	0.%{beta}.2
+Release:	0.%{beta}.%{rel}
 License:	GPL v2
 Group:		Base
-# git://git.savannah.gnu.org/grub.git
-# git checkout %{version}~%{beta} ; make dist
-Source0:	grub-%{version}~%{beta}.tar.gz
-# Source0-md5:	ca6c18f6c5f1ed05b7444017a40573d9
+# 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
 Source1:	update-grub
 Source2:	update-grub.8
 Source3:	grub.sysconfig
 Source4:	grub-custom.cfg
-# ./linguas.sh
-# TS=$(date +'%Y%m%d') ; tar cjvf grub-po-2.00.git$TS.tar.bz2 po/*.po po/LINGUAS
-Source5:	grub-po-%{version}.git20140104.tar.bz2
-# Source5-md5:	aeef3e636178093cf9d780d92da7afdb
 Patch1:		pld-sysconfdir.patch
 Patch2:		grub-garbage.patch
 Patch3:		grub-lvmdevice.patch
@@ -74,6 +63,12 @@ Patch9:		just-say-linux.patch
 Patch10:	ignore-kernel-symlinks.patch
 Patch11:	choose-preferred-initrd.patch
 Patch12:	%{name}-cfg.patch
+Patch13:	efi-net-fix.patch
+Patch14:	grub2-xfs-Add-helper-for-inode-size.patch
+Patch15:	grub2-xfs-Convert-inode-numbers-to-cpu-endianity-immediate.patch
+Patch16:	grub2-xfs-Fix-termination-loop-for-directory-iteration.patch
+Patch17:	grub2-xfs-V5-filesystem-format-support.patch
+Patch18:	blscfg.patch
 URL:		http://www.gnu.org/software/grub/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.11.1-1
@@ -83,7 +78,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
@@ -101,14 +97,10 @@ 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:	pld-release
+Requires:	issue
 Requires:	which
 %ifarch %{ix86} %{x8664}
 Suggests:	%{name}-platform-pc
@@ -117,7 +109,7 @@ Suggests:	cdrkit-mkisofs
 Suggests:	os-prober
 Provides:	bootloader
 Conflicts:	grub
-ExclusiveArch:	%{ix86} %{x8664} ia64 mips mipsel ppc ppc64 sparc64
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -283,7 +275,7 @@ starfield theme for GRUB.
 Motyw starfield dla GRUB-a.
 
 %prep
-%setup -q -n grub-%{version}~%{beta} -a5
+%setup -q -n grub-%{version}~%{beta}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -296,6 +288,12 @@ Motyw starfield dla GRUB-a.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p0
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -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*
@@ -305,13 +303,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}
@@ -327,7 +325,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 \
@@ -387,9 +385,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %ifnarch %{ix86} %{x8664}
 %{__rm} $RPM_BUILD_ROOT{%{_sbindir}/grub-bios-setup,%{_mandir}/man8/grub-bios-setup.8}
 %endif
-%ifnarch sparc64
 %{__rm} $RPM_BUILD_ROOT{%{_sbindir}/grub-sparc64-setup,%{_mandir}/man8/grub-sparc64-setup.8}
-%endif
 
 # core.img - bootable image generated by grub-mkimage(1) via grub-install(1)
 touch $RPM_BUILD_ROOT%{_grubdir}/core.img
@@ -464,10 +460,6 @@ fi
 %attr(755,root,root) %{_sbindir}/grub-probe
 %{_mandir}/man8/grub-probe.8*
 %endif
-%ifarch sparc64
-%attr(755,root,root) %{_sbindir}/grub-sparc64-setup
-%{_mandir}/man8/grub-sparc64-setup.8*
-%endif
 %{_mandir}/man1/grub-editenv.1*
 %{_mandir}/man1/grub-file.1*
 %{_mandir}/man1/grub-fstest.1*
@@ -552,7 +544,7 @@ fi
 %{_libexecdir}/*-pc/efiemu*.o
 %endif
 %{_libexecdir}/*-pc/kernel.img
-%ifarch %{ix86} %{x8664} sparc sparc64
+%ifarch %{ix86} %{x8664}
 %{_libexecdir}/*-pc/boot.img
 %{_libexecdir}/*-pc/boot_hybrid.img
 %{_libexecdir}/*-pc/cdboot.img