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

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 0da3ce6..49cf47d 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -17,9 +17,11 @@ BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 1.5
 BuildRequires: augeas-devel >= 0.5.0
-BuildRequires: qemu
+BuildRequires: readline-devel
+BuildRequires: qemu >= 0.10-7
 
-# If you want to build the bindings for different languages:
+# These are only required if you want to build the bindings for
+# different languages:
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
 BuildRequires: perl-devel
@@ -30,7 +32,7 @@ BuildRequires: perl-ExtUtils-MakeMaker
 BuildRequires: python-devel
 
 # Runtime requires:
-Requires:    qemu
+Requires:    qemu >= 0.10-7
 
 
 %description
@@ -57,6 +59,12 @@ programs.
 See also the 'guestfish' package for shell scripting and command line
 access.
 
+For Perl bindings, see 'libguestfs-perl'.
+
+For OCaml bindings, see 'libguestfs-ocaml-devel'.
+
+For Python bindings, see 'libguestfs-python'.
+
 
 %package devel
 Summary:     Development tools and libraries for %{name}
@@ -123,6 +131,8 @@ Summary:     Python bindings for %{name}
 Group:       Development/Libraries
 Requires:    %{name} = %{version}-%{release}
 
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %description python
 %{name}-python contains Python bindings for %{name}.
@@ -142,7 +152,7 @@ make INSTALLDIRS=vendor
 
 
 %check
-make check
+test -n "$QUICK_RPMBUILD" || make check
 
 
 %install
@@ -173,6 +183,13 @@ popd
 find $RPM_BUILD_ROOT -name perllocal.pod -delete
 find $RPM_BUILD_ROOT -name .packlist -delete
 
+rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.a
+rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.la
+
+mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
+mv $RPM_BUILD_ROOT%{python_sitearch}/guestfs.py* \
+  $RPM_BUILD_ROOT%{python_sitelib}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -193,6 +210,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc HACKING TODO README ex html/guestfs.3.html html/pod.css
+%doc src/generator.ml
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_includedir}/guestfs.h
@@ -236,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-,root,root,-)
+%{python_sitearch}/*
+%{python_sitelib}/*.py
+%{python_sitelib}/*.pyc
+%{python_sitelib}/*.pyo
 
 
 %changelog