Browse Source

grub:
- add Patch110 to support ext4 filesystem
- add Patch120 to build with current binutils
- add Patch130 to build with ncurses-5.6
- add R(post): install-info, grep, sed, coreutils
- add R(preun): install-info
- add BR: compat32-glibc-{devel,static} for x86_64
- add BR: glibc-static



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3083 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 14 years ago
parent
commit
7403e5292a
1 changed files with 23 additions and 3 deletions
  1. 23 3
      g/grub/grub-vl.spec

+ 23 - 3
g/grub/grub-vl.spec

@@ -10,7 +10,7 @@ Summary: grub - a Multiboot boot loader.
 Summary(ja): grub - マルチブートローダ
 Name: grub
 Version: 0.97
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: GPL
 Group: System Environment/Base
 URL: http://www.gnu.org/software/grub/
@@ -20,14 +20,20 @@ Source1: %{defshell}
 
 Patch10: grub-0.97-prototypes.patch
 Patch100: ext3_256byte_inode.diff
+Patch110: grub-0.97-ext4-support.patch
+Patch120: grub-0.97-build-id=none.patch
+Patch130: grub-0.97-tinfo.patch
 
 ExclusiveArch: %{ix86} x86_64
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-PreReq: install-info, sed, grep
+Requires(post): install-info, sed, grep, coreutils
+Requires(preun): install-info
 Requires: mktemp
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel >= 5.6
+BuildRequires: glibc-static
 %ifarch x86_64
 BuildRequires: compat32-glibc-devel
+BuildRequires: compat32-glibc-static
 %endif
 
 %description
@@ -57,6 +63,11 @@ GNU GRUB はマルチブートローダです。
 %setup -q
 %patch10 -p1 -b .prototypes
 %patch100 -p1 -b .ext3_256byte_inode
+%patch110 -p1 -b .ext4
+%patch120 -p1 -b .build-id
+%patch130 -p1 -b .ncurses5
+aclocal
+autoconf
 
 %build
 GCCVERS=$(gcc --version | head -1 | cut -d\  -f3 | cut -d. -f1)
@@ -101,6 +112,15 @@ fi
 %{_mandir}/man*/*
 
 %changelog
+* Wed Mar 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.97-3
+- add Patch110 to support ext4 filesystem
+- add Patch120 to build with current binutils
+- add Patch130 to build with ncurses-5.6
+- add R(post): install-info, grep, sed, coreutils
+- add R(preun): install-info
+- add BR: compat32-glibc-{devel,static} for x86_64
+- add BR: glibc-static
+
 * Wed Jan 21 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.97-2
 - add patch100 to support newer e2fsprogs