rpms/yaboot/F-12 yaboot.spec,1.74,1.75

[Roman Rakus]

Author: rrakus

Update of /cvs/extras/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10249

Modified Files:
	yaboot.spec 
Log Message:
Changes for merge review


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- yaboot.spec	29 Oct 2009 10:58:41 -0000	1.74
+++ yaboot.spec	1 Dec 2009 15:00:26 -0000	1.75
@@ -1,7 +1,7 @@
-Summary: Linux bootloader for Power Macintosh "New World" computers.
+Summary: Linux bootloader for Power Macintosh "New World" computers
 Name: yaboot
 Version: 1.3.14
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -44,8 +44,7 @@ Patch38: yaboot-1.3.14-better_netboot2.p
 Patch39: yaboot-1.3.14-move_kernel.patch
 
 URL: http://yaboot.ozlabs.org/
-BuildRoot: %{_tmppath}/%{name}-root
-Obsoletes: ybin
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ExclusiveArch: ppc
 
 # hfsutils will not be in RHEL6.
@@ -96,18 +95,24 @@ yaboot can also bootload IBM pSeries mac
 %patch39 -p1 -b .movekernel
 
 %build
+iconv -f ISO88592 -t utf-8 -o doc/yaboot-howto.de.try.sgml \
+    doc/yaboot-howto.de.sgml && mv -f doc/yaboot-howto.de.try.sgml \
+    doc/yaboot-howto.de.sgml
 make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
 cp -a second/yaboot{,.debug}
 make clean
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %makeinstall ROOT=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=share/man SBINDIR=/sbin
 rm -f $RPM_BUILD_ROOT/etc/yaboot.conf
 touch $RPM_BUILD_ROOT/etc/yaboot.conf
 mkdir -p $RPM_BUILD_ROOT/boot
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/boot/efika.forth
 install -m0644 second/yaboot.debug $RPM_BUILD_ROOT/usr/lib/yaboot/
+rm -f $RPM_BUILD_ROOT/usr/share/doc/yaboot-1.3.14/README.man.patch
+rm -f $RPM_BUILD_ROOT/usr/share/doc/yaboot-1.3.14/Makefile
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ybin
 /sbin/yabootconfig
 /sbin/mkofboot
+/usr/lib/yaboot/
 /usr/lib/yaboot/addnote
 /usr/lib/yaboot/ofboot
 /usr/lib/yaboot/yaboot
@@ -134,6 +140,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Tue Dec 01 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-24
+- Fixed summary, buildroot
+- Converted doc/yaboot-howto.de.sgml to utf8
+- Clear buildroot before install
+- Removed README.man.patch and Makefile from doc dir
+- Own /usr/lib/yaboot/
+- Fixes (#226661)
+
 * Thu Oct 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-23
 - When netbooting "clobber" the LOAD_BUFFER and move the kernel into it to make
   room for RTAS (#530330)