X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs.spec.in;h=0aaa10b1b0f4a6df722a4481990a17ea93be6cfd;hb=946eec285f634e51b3ea6416a6d7947427c66797;hp=8a653a78def7d55b8fd0975c9f82b6a7a6d825f4;hpb=c169a0bb9ddde5b61045d95fb2728b43751488f1;p=libguestfs.git

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 8a653a7..0aaa10b 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -16,15 +16,20 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 1.5
-BuildRequires: augeas-devel
+BuildRequires: augeas-devel >= 0.5.0
+BuildRequires: readline-devel
+BuildRequires: qemu
 
-# 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
+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
@@ -54,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}
@@ -115,14 +126,16 @@ 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}
 
+%{!?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}.
+%description python
+%{name}-python contains Python bindings for %{name}.
 
 
 %prep
@@ -139,7 +152,7 @@ make INSTALLDIRS=vendor
 
 
 %check
-make check
+test -n "$QUICK_RPMBUILD" || make check
 
 
 %install
@@ -161,8 +174,8 @@ rm -rf .deps .libs
 popd
 
 # Same for ocaml/examples.
-cp -a ocaml/examples ocaml-ex
-pushd ocaml-ex
+cp -a ocaml/examples ocaml/ex
+pushd ocaml/ex
 make clean
 rm Makefile*
 popd
@@ -170,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
@@ -189,7 +209,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc HACKING README ex html/guestfs.3.html html/pod.css
+%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
@@ -217,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files ocaml-devel
 %defattr(-,root,root,-)
-%doc ocaml-ex
+%doc ocaml/ex
 %{_libdir}/ocaml/guestfs/*.a
 %{_libdir}/ocaml/guestfs/*.cmxa
 %{_libdir}/ocaml/guestfs/*.cmx
@@ -231,8 +252,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Sys::Guestfs.3pm*
 
 
-# %files python
-# %defattr(-,root,root,-)
+%files python
+%defattr(-,root,root,-)
+%{python_sitearch}/*
+%{python_sitelib}/*.py
+%{python_sitelib}/*.pyc
+%{python_sitelib}/*.pyo
 
 
 %changelog