packages: grub2/grub2.spec - ppc fixes

arekm arekm at pld-linux.org
Fri Jul 10 13:29:16 CEST 2009


Author: arekm                        Date: Fri Jul 10 11:29:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ppc fixes

---- Files affected:
packages/grub2:
   grub2.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.46 packages/grub2/grub2.spec:1.47
--- packages/grub2/grub2.spec:1.46	Fri Jul 10 13:14:06 2009
+++ packages/grub2/grub2.spec	Fri Jul 10 13:29:11 2009
@@ -140,10 +140,6 @@
 
 install docs/grub.cfg $RPM_BUILD_ROOT%{_datadir}
 
-%ifarch ppc
-install grubof $RPM_BUILD_ROOT%{_datadir}
-%endif
-
 # create -devel subpackage?
 rm -r $RPM_BUILD_ROOT%{_includedir}/grub $RPM_BUILD_ROOT%{_includedir}/*.h
 
@@ -154,14 +150,21 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_sbindir}/grub-dumpbios
-%attr(755,root,root) %{_sbindir}/grub-mkimage
 %attr(755,root,root) %{_sbindir}/grub-install
 %attr(755,root,root) %{_sbindir}/grub-mkrescue
 %attr(755,root,root) %{_sbindir}/grub-editenv
 %attr(755,root,root) %{_sbindir}/grub-mkconfig
 %attr(755,root,root) %{_sbindir}/grub-mkelfimage
-%{_mandir}/man8/grub-dumpbios.8*
+%ifarch %{ix86} %{x8664}
+%attr(755,root,root) %{_sbindir}/grub-mkimage
 %{_mandir}/man1/grub-mkimage.1*
+%else
+%attr(755,root,root) %{_sbindir}/grub-probe
+%attr(755,root,root) %{_sbindir}/grub-mkdevicemap
+%{_mandir}/man8/grub-probe.8*
+%{_mandir}/man8/grub-mkdevicemap.8*
+%endif
+%{_mandir}/man8/grub-dumpbios.8*
 %{_mandir}/man8/grub-install.8*
 %{_mandir}/man1/grub-mkrescue.1*
 %{_mandir}/man1/grub-editenv.1*
@@ -173,9 +176,13 @@
 %endif
 %config(noreplace) %verify(not md5 mtime size) %dir %{_datadir}/grub.cfg
 %dir %{_datadir}
-%{_datadir}/*-pc
+%ifarch %{ix86} %{x8664}
+%{_datadir}/i386-pc
+%endif
+%ifarch ppc ppc64
+%{_datadir}/powerpc-*
+%endif
 %attr(755,root,root) %{_legcdir}/*_lib
-%attr(755,root,root) %{_legcdir}/*.*
 %dir %{_confdir}
 %attr(755,root,root) %{_confdir}/00_header
 %attr(755,root,root) %{_confdir}/10_linux
@@ -197,6 +204,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2009/07/10 11:29:11  arekm
+- ppc fixes
+
 Revision 1.46  2009/07/10 11:14:06  arekm
 - up to 20090710; should fix ppc build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.46&r2=1.47&f=u



More information about the pld-cvs-commit mailing list