X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs.spec.in;h=f4659bfc576071241a09b9db00a19825a18d6014;hb=f1a10c6285cca30f8c9491ae08951137457bb018;hp=f719c0580998220146a1fbb15f546bd026818401;hpb=b5ff6816face6f8c1700d4f1df752c710620ff95;p=libguestfs.git

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index f719c05..f4659bf 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -1,6 +1,6 @@
 # @configure_input@
 
-%global mirror http://hakodate/mirrors/fedora/10/Fedora/x86_64/os/
+#%global mirror http://hakodate/mirrors/fedora/10/Fedora/x86_64/os/
 
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
@@ -15,10 +15,13 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
-BuildRequires: febootstrap
+BuildRequires: febootstrap >= 1.5
+BuildRequires: augeas-devel >= 0.5.0
+BuildRequires: qemu
 
 # If you want to build the bindings for different languages:
 BuildRequires: ocaml
+BuildRequires: ocaml-findlib-devel
 BuildRequires: perl-devel
 BuildRequires: perl-Test-Pod
 BuildRequires: perl-Test-Pod-Coverage
@@ -129,13 +132,18 @@ Requires:    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)
 
 
 %build
-%configure --with-mirror=%{mirror}
+#%configure --with-mirror=%{mirror}
+%configure
 
 # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
 # not the site dir.
 make INSTALLDIRS=vendor
 
 
+%check
+make check
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -145,12 +153,22 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
 
 # Clean up the examples/ directory which will get installed in %doc.
-pushd examples
+# Note we can't delete the original examples/Makefile because that
+# will be needed by the check section later in the RPM build.
+cp -a examples ex
+pushd ex
 make clean
 rm Makefile*
 rm -rf .deps .libs
 popd
 
+# Same for ocaml/examples.
+cp -a ocaml/examples ocaml/ex
+pushd ocaml/ex
+make clean
+rm Makefile*
+popd
+
 find $RPM_BUILD_ROOT -name perllocal.pod -delete
 find $RPM_BUILD_ROOT -name .packlist -delete
 
@@ -173,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc HACKING README examples
+%doc HACKING README ex html/guestfs.3.html html/pod.css
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_includedir}/guestfs.h
@@ -183,6 +201,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n guestfish
 %defattr(-,root,root,-)
+%doc html/guestfish.1.html html/pod.css
 %{_bindir}/guestfish
 %{_mandir}/man1/guestfish.1*
 
@@ -200,6 +219,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files ocaml-devel
 %defattr(-,root,root,-)
+%doc ocaml/ex
 %{_libdir}/ocaml/guestfs/*.a
 %{_libdir}/ocaml/guestfs/*.cmxa
 %{_libdir}/ocaml/guestfs/*.cmx