grub2.spec

[Daniel Dawid Majewski]

Zajrzałem do changeloga - znalazłem :
* grub-emu is made optional.  Now you have to use
  `--enable-grub-emu' to enable it.
Jakby ktoś zerknął, czy dobrze zaimplementowana (diff -u razem z
poprzednimi poprawkami do wersji w cvs w załączniku).
-- 
Pozdrawiam,
Daniel Dawid Majewski
jabber:light-i/jid.pl
-------------- next part --------------
--- grub2.spec.oryg	2008-12-14 09:15:21.000000000 +0100
+++ grub2.spec	2008-12-14 11:38:24.000000000 +0100
@@ -24,6 +24,7 @@
 Group:		Base
 Source0:	ftp://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
 # Source0-md5:	0a40cd2326a4e84d1978060f2e02a956
+Patch0:		%{name}-parser.patch
 URL:		http://www.gnu.org/software/grub/grub-2.en.html
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -34,8 +35,8 @@
 BuildRequires:	lzo-devel >= 1.0.2
 %endif
 %ifarch %{x8664}
-BuildRequires:	gcc-multilib
 BuildRequires:	/usr/lib/libc.so
+BuildRequires:	gcc-multilib
 %endif
 BuildRequires:	ncurses-devel
 #BuildRequires:	ruby >= 1.6
@@ -103,6 +104,7 @@
 
 %prep
 %setup -q -n grub-%{version}
+%patch0 -p1
 sed -i -e 's#AC_INIT(GRUB,#AC_INIT(GRUB2,#g' configure.ac
 sed -i -e 's,/boot/grub,%{_datadir},' \
 	./include/grub/util/misc.h ./util/i386/efi/grub-install.in ./util/i386/pc/grub-install.in \
@@ -124,7 +126,6 @@
 AWK=gawk \
 %configure \
 	BUILD_CFLAGS="$CFLAGS"
-
 %{__make} -j1 \
 	BUILD_CFLAGS="$CFLAGS" \
 %if %{with static}
@@ -136,17 +137,20 @@
 %endif
 	grub_emu_LDFLAGS="-s -static -lncurses -ltinfo" \
 %endif
-	pkgdatadir="%{_libdir}/%{name}"
+%if %{with grub-emu}
+	grub_setup_LDFLAGS="%{grub_setup_LDFLAGS} --enable-grub-emu"
+%endif
+pkgdatadir="%{_datadir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	pkgdatadir="%{_libdir}/%{name}"
+pkgdatadir="%{_datadir}"
 
 %ifarch ppc
-install grubof $RPM_BUILD_ROOT%{_libdir}/%{name}
+install grubof $RPM_BUILD_ROOT%{_datadir}
 %endif
 %ifarch %{ix86} %{x8664}
 mv -f $RPM_BUILD_ROOT%{_sbindir}/{grub-install,%{name}-install}
@@ -158,7 +162,7 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
-%{_libdir}/%{name}
+%{_datadir}
 %attr(755,root,root) %{_sbindir}/grub-mkimage
 %attr(755,root,root) %{_sbindir}/grub2-install
 %ifarch %{ix86} %{x8664}
@@ -173,6 +177,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log: grub2.spec,v $
+Revision 1.41  2008/02/04 19:37:45  light-i
+- small correct to build in grub-1.96/normal/parser.y:58
+- adapterized
+
 Revision 1.40  2008/02/04 19:37:45  arekm
 - 1.96