SPECS: grub.spec - 64bit builds if you have 32bit static glibc installed - ...

glen glen at pld-linux.org
Wed May 28 17:31:21 CEST 2008


Author: glen                         Date: Wed May 28 15:31:21 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 64bit builds if you have 32bit static glibc installed
- do not remove it with some bogus commit!
- add todo about grub upgrade problem

---- Files affected:
SPECS:
   grub.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: SPECS/grub.spec
diff -u SPECS/grub.spec:1.121 SPECS/grub.spec:1.122
--- SPECS/grub.spec:1.121	Wed May 28 03:49:04 2008
+++ SPECS/grub.spec	Wed May 28 17:31:16 2008
@@ -1,11 +1,12 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - check VGA patch - doesn't work good, 0.92 works fine
+# - upgrading grub makes installed grub in MBR lose track of menu.lst, with
+#   console access can write 'configfile /grub/menu.lst' but without console
+#   access your machine stays in grub on boot!
 #
 # Conditional build:
-%bcond_with	splashimage	# removes some ethernet cards support
-				# (too much memory occupied?)
+%bcond_with	splashimage	# removes some ethernet cards support (too much memory occupied?)
 %bcond_without	static		# don't build static version
 #
 Summary:	GRand Unified Bootloader
@@ -14,7 +15,7 @@
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB
 Name:		grub
 Version:	0.97
-Release:	9
+Release:	10
 License:	GPL
 Group:		Base
 Source0:	ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz
@@ -51,11 +52,14 @@
 BuildRequires:	glibc-static
 BuildRequires:	ncurses-static
 %endif
+%ifarch %{x8664}
+BuildRequires:	/usr/lib/libc.a
+%endif
 # needed for 'cmp' program
 Requires:	diffutils
 Provides:	bootloader
 Obsoletes:	fedora-logos
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -255,10 +259,10 @@
 	ln -sf menu.lst /boot/grub/grub.conf
 fi
 
-%post	-p	/sbin/postshell
+%post	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun	-p	/sbin/postshell
+%postun	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
@@ -273,7 +277,7 @@
 %{_infodir}/*.info*
 %{_mandir}/*/*
 
-%if !%{with splashimage}
+%if %{without splashimage}
 %files nb
 %defattr(644,root,root,755)
 %{_libdir}/grub/nbgrub
@@ -293,6 +297,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2008-05-28 15:31:16  glen
+- 64bit builds if you have 32bit static glibc installed
+- do not remove it with some bogus commit!
+- add todo about grub upgrade problem
+
 Revision 1.121  2008-05-28 01:49:04  glen
 - /boot/grub/splash.xpm.gz from install of grub-0.97-8 conflicts with file from package fedora-logos-1.1.24-1
   err, obsoletes fedora-logos
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/grub.spec?r1=1.121&r2=1.122&f=u



More information about the pld-cvs-commit mailing list