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

diff --git a/grub2.spec b/grub2.spec
index b1cb292..e51136d 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -30,13 +30,13 @@
 %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
+%define	beta	rc1
 Name:		grub2
 Version:	2.02
 Release:	0.%{beta}.%{rel}
@@ -46,29 +46,25 @@ Group:		Base
 # 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:	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
+Patch14:	blscfg.patch
 URL:		http://www.gnu.org/software/grub/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.11.1-1
@@ -275,7 +271,7 @@ starfield theme for GRUB.
 Motyw starfield dla GRUB-a.
 
 %prep
-%setup -q -n grub-%{version}~%{beta}
+%setup -q -n grub-%{version}-%{beta}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -287,13 +283,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 +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
@@ -465,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*
@@ -478,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*