From e28cef0fc2dd3c94d3704b0266c4b20ec5ebbe3d Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@fedoraproject.org>
Date: May 28 2009 08:03:37 +0000
Subject: doc subpackage fixes


---

diff --git a/xen.spec b/xen.spec
index 7dad496..ef020fb 100644
--- a/xen.spec
+++ b/xen.spec
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -143,7 +143,7 @@ export XEN_VENDORVERSION="-%{release}"
 export CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags} prefix=/usr dist-xen
 make %{?_smp_mflags} prefix=/usr dist-tools
-make %{?_smp_mflags} prefix=/usr dist-docs
+make                 prefix=/usr dist-docs
 unset CFLAGS
 make dist-stubdom
 
@@ -222,7 +222,9 @@ install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
 ############ fixup info files ############
 
 mkdir -p %{buildroot}/usr/share/info
-mv %{buildroot}/usr/info/*info* %{buildroot}/usr/share/info
+for info in %{buildroot}/usr/info/*info*; do
+	mv "$info" "%{buildroot}/usr/share/info/xen-$(basename $info)"
+done
 rmdir %{buildroot}/usr/info
 
 ############ create dirs in /var ############
@@ -278,6 +280,16 @@ fi
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
+%post doc
+/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-configure.info
+/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-standards.info
+
+%preun doc
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-configure.info
+  /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-standards.info
+fi
+
 %clean
 rm -rf %{buildroot}
 
@@ -449,6 +461,11 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Thu May 28 2009 Gerd Hoffmann <kraxel@redhat.com> - 3.4.0-2
+- rename info files to fix conflict with binutils.
+- add install-info calls for the doc subpackage.
+- un-parallelize doc build.
+
 * Wed May 27 2009 Gerd Hoffmann <kraxel@redhat.com> - 3.4.0-1
 - update to version 3.4.0.
 - cleanup specfile, add doc subpackage.