X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=libguestfs.spec.in;h=76b8fb23d8aa441a9dd23fe19a866231aa4c6afd;hp=fa550145438b4612f226858ce53c810511666fde;hb=08361c8987f4552649b6c708f52e940e1575fa6e;hpb=5e62afd7ce5145eee1894fab6f0722119fee1d31

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index fa55014..76b8fb2 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -26,11 +26,16 @@ BuildRequires: readline-devel
 BuildRequires: qemu >= 0.10-7
 BuildRequires: createrepo
 
+# This is only needed for RHEL 5 because readline-devel doesn't
+# properly depend on it, but doesn't do any harm on other platforms:
+BuildRequires: ncurses-devel
+
 # Build requirements for the appliance:
 # (see 'make-initramfs.sh.in' in the source)
 BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
 BuildRequires: MAKEDEV, net-tools, augeas-libs, file
 BuildRequires: module-init-tools, procps, strace, iputils
+BuildRequires: grub, dosfstools, ntfsprogs
 
 # These are only required if you want to build the bindings for
 # different languages:
@@ -234,6 +239,8 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+mkdir -p daemon/m4
+
 
 %build
 %if %{buildnonet}
@@ -247,15 +254,19 @@ createrepo repo
 
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
+  --mandir=%{_mandir} \
   --with-java-home=%{java_home} \
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   --enable-debug-command \
   %{extra}
 
+# This ensures that /usr/sbin/chroot is on the path.  Not needed
+# except for RHEL 5, it shouldn't do any harm on other platforms.
+export PATH=/usr/sbin:$PATH
+
 # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
 # not the site dir.
-# Uses javac which is incompatible with parallel make.
-make INSTALLDIRS=vendor
+make INSTALLDIRS=vendor %{?_smp_mflags}
 
 
 %check
@@ -419,9 +430,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Apr 28 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
+* Fri May  8 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
 - New upstream version @VERSION@.
 
+* Fri May  8 2009 Richard Jones <rjones@redhat.com> - 1.0.21-2
+- New upstream version 1.0.21.
+
+* Thu May  7 2009 Richard Jones <rjones@redhat.com> - 1.0.20-2
+- New upstream version 1.0.20.
+
+* Thu May  7 2009 Richard Jones <rjones@redhat.com> - 1.0.19-1
+- New upstream version 1.0.19.
+
 * Tue Apr 28 2009 Richard Jones <rjones@redhat.com> - 1.0.15-1
 - New upstream version 1.0.15.