X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=libguestfs.spec.in;h=0da3ce69df890a4f0c03b76db8d1fcec5dde55c6;hp=bc611effdc3eb663a61830492695d24236e3231e;hb=b3f11c5f62f725fa3f09452b38d52dba764f80d0;hpb=bf26360e5e91148a4479f812c2b43acce4f5884e

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index bc611ef..0da3ce6 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,15 +15,19 @@ 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-Simple
 BuildRequires: perl-Test-Pod
 BuildRequires: perl-Test-Pod-Coverage
 BuildRequires: perl-ExtUtils-MakeMaker
-# BuildRequires: python-devel
+BuildRequires: python-devel
 
 # Runtime requires:
 Requires:    qemu
@@ -114,14 +118,14 @@ Requires:    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)
 %{name}-perl contains Perl bindings for %{name}.
 
 
-# %package python
-# Summary:     Python bindings for %{name}
-# Group:       Development/Libraries
-# Requires:    %{name} = %{version}-%{release}
+%package python
+Summary:     Python bindings for %{name}
+Group:       Development/Libraries
+Requires:    %{name} = %{version}-%{release}
 
 
-# %description python
-# %{name}-python contains Python bindings for %{name}.
+%description python
+%{name}-python contains Python bindings for %{name}.
 
 
 %prep
@@ -129,13 +133,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,14 +154,18 @@ 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.
-pushd ocaml/examples
+cp -a ocaml/examples ocaml/ex
+pushd ocaml/ex
 make clean
 rm Makefile*
 popd
@@ -179,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc HACKING README examples
+%doc HACKING TODO README ex html/guestfs.3.html html/pod.css
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_includedir}/guestfs.h
@@ -189,6 +202,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*
 
@@ -206,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files ocaml-devel
 %defattr(-,root,root,-)
-%doc ocaml/examples
+%doc ocaml/ex
 %{_libdir}/ocaml/guestfs/*.a
 %{_libdir}/ocaml/guestfs/*.cmxa
 %{_libdir}/ocaml/guestfs/*.cmx
@@ -220,8 +234,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Sys::Guestfs.3pm*
 
 
-# %files python
-# %defattr(-,root,root,-)
+%files python
+%defattr(-,root,root,-)
 
 
 %changelog