- up to 1.3.17 (untested)

diff --git a/yaboot-bash.patch b/yaboot-bash.patch
index f53ae05cddc3b282be8e301c0515fe4847d78ef5..51ac7ba3d4a8f72c59b640dc4bf6a233e318e022 100644 (file)
--- a/yaboot-bash.patch
+++ b/yaboot-bash.patch
@@ -19,26 +19,6 @@ diff -uNr yaboot-1.3.6.orig/man.patch yaboot-1.3.6/man.patch
   \fBybin\fR). It is thus critical that it not be writable by anyone but
   root.  It is also critical that \fI/etc/yaboot.conf\fR not be writable
   by anyone but root since a different \fIofboot\fR script could be
-diff -uNr yaboot-1.3.6.orig/ybin/mkofboot yaboot-1.3.6/ybin/mkofboot
---- yaboot-1.3.6.orig/ybin/mkofboot    Sat Dec  1 10:58:11 2001
-+++ yaboot-1.3.6/ybin/mkofboot Tue Mar 19 03:02:02 2002
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- 
- ###############################################################################
- ##
-@@ -1192,8 +1192,8 @@
- 
-     ## call ofboot,
-     ## Usage: OS-count defaultos timeout fgc bgc osname oslabel oskey osdev osfile ...
--    [ "$DEBUG" = 1 ] && $PRINTF 1>&2 "$PRG: DEBUG: /bin/sh $magicboot $OS $defaultos $delay $fbc $bgc $YB $BSD $MAC $MX $DW $CD $NET $OF\n"
--    FIRST="$(/bin/sh "$magicboot" "$OS" "$defaultos" "$delay" $fgc $bgc ${YB} ${BSD} ${MAC} ${MX} ${DW} ${CD} ${NET} ${OF})" || return 1
-+    [ "$DEBUG" = 1 ] && $PRINTF 1>&2 "$PRG: DEBUG: /bin/bash $magicboot $OS $defaultos $delay $fbc $bgc $YB $BSD $MAC $MX $DW $CD $NET $OF\n"
-+    FIRST="$(/bin/bash "$magicboot" "$OS" "$defaultos" "$delay" $fgc $bgc ${YB} ${BSD} ${MAC} ${MX} ${DW} ${CD} ${NET} ${OF})" || return 1
- 
-     return 0
- }
 diff -uNr yaboot-1.3.6.orig/ybin/ofpath yaboot-1.3.6/ybin/ofpath
 --- yaboot-1.3.6.orig/ybin/ofpath      Thu Sep 20 15:15:32 2001
 +++ yaboot-1.3.6/ybin/ofpath   Tue Mar 19 03:01:31 2002

diff --git a/yaboot.spec b/yaboot.spec
index e2dabd6ba6a19010697edf24217424df1ceb7bba..e62ab850c9c02c0c597fa3c627daf264069d4a65 100644 (file)
--- a/yaboot.spec
+++ b/yaboot.spec
@@ -5,12 +5,12 @@
 Summary:       Linux bootloader for Power Macintosh "New World" computers
 Summary(pl.UTF-8):     Bootloader dla komputerów Power Macintosh "New World"
 Name:          yaboot
-Version:       1.3.14
+Version:       1.3.17
 Release:       0.1
-License:       GPL
+License:       GPL v2+
 Group:         Applications/System
 Source0:       http://yaboot.ozlabs.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 9b1246c474eeb37f61081ad762563b35
+# Source0-md5: f599f52d1887a86fd798252d2946f635
 Source1:       %{name}_functions.sh
 Patch0:                %{name}-man.patch
 Patch1:                %{name}-user.patch
@@ -91,12 +91,22 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %doc doc/yaboot-howto.html
 %endif
-%attr(755,root,root) /sbin/*
+%attr(755,root,root) /sbin/mkofboot
+%attr(755,root,root) /sbin/ofpath
+%attr(755,root,root) /sbin/yabootconfig
+%attr(755,root,root) /sbin/ybin
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %dir /lib/%{name}
 %attr(755,root,root) /lib/%{name}/addnote
-/lib/%{name}/*boot
-%{_mandir}/man?/*
+%attr(755,root,root) /lib/%{name}/ofboot
+%attr(755,root,root) /lib/%{name}/yaboot
+%{_mandir}/man5/yaboot.conf.5*
+%{_mandir}/man8/bootstrap.8*
+%{_mandir}/man8/mkofboot.8*
+%{_mandir}/man8/ofpath.8*
+%{_mandir}/man8/yaboot.8*
+%{_mandir}/man8/yabootconfig.8*
+%{_mandir}/man8/ybin.8*
 
 %files -n rc-boot-yaboot
 %defattr(644,root,root,755)