X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=grub2.spec;h=59388fb0cef73be4afff4654cf9c826faf9ecdba;hb=37c1d015a25095060b7e8e27365fa2767a402366;hp=f66007ea28b1f6baf5e56e1653a74e22c1ae094a;hpb=0c7e9e937b0b31aa78da86bd80f3957eafc8092d;p=packages%2Fgrub2.git

diff --git a/grub2.spec b/grub2.spec
index f66007e..59388fb 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -30,23 +30,19 @@
 %define		platforms %{?with_efi:efi} %{?with_pc:pc}
 %endif
 
-%define		rel	6
+%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
 Name:		grub2
-Version:	2.02
-Release:	0.%{beta}.%{rel}
+Version:	2.04
+Release:	1
 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:	ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
+# Source0-md5:	5aaca6713b47ca2456d8324a58755ac7
 Source1:	update-grub
 Source2:	update-grub.8
 Source3:	grub.sysconfig
@@ -58,17 +54,13 @@ 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:	initrd-search.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
+Patch8:		just-say-linux.patch
+Patch9:		ignore-kernel-symlinks.patch
+Patch10:	initrd-search.patch
+Patch11:	%{name}-cfg.patch
+Patch12:	efi-net-fix.patch
+Patch13:	blscfg.patch
+Patch14:	restricted.patch
 URL:		http://www.gnu.org/software/grub/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.11.1-1
@@ -275,7 +267,7 @@ starfield theme for GRUB.
 Motyw starfield dla GRUB-a.
 
 %prep
-%setup -q -n grub-%{version}~%{beta}
+%setup -q -n grub-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -287,13 +279,9 @@ Motyw starfield dla GRUB-a.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p0
+%patch12 -p1
 %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*
@@ -424,7 +412,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
@@ -465,7 +453,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*
@@ -478,6 +465,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*