From 6e66580f544dbd112ab8b7aeeef629860b9c1102 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 4 Mar 2008 18:12:15 +0000
Subject: [PATCH] - New upstream release 0.4.1.0. - Upstream now requires
 ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0,     gnome-icon-theme. - Enable
 virt-df.

---
 ocaml-libvirt.spec | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec
index bd2488d..62e772f 100644
--- a/ocaml-libvirt.spec
+++ b/ocaml-libvirt.spec
@@ -5,12 +5,12 @@
 %define build_mlvirsh                1
 %define build_virt_ctrl              1
 %define build_virt_top               1
-%define build_virt_df                0
+%define build_virt_df                1
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.4.0.3
-Release:        3%{?dist}
+Version:        0.4.1.0
+Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -22,10 +22,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
+
 %if %build_virt_ctrl
-BuildRequires:  ocaml-lablgtk-devel
+BuildRequires:  ocaml-lablgtk-devel >= 2.10.0
 BuildRequires:  gtk2-devel
+BuildRequires:  gnome-icon-theme
+BuildRequires:  ocaml-dbus-devel >= 0.06
+BuildRequires:  dbus-devel
 %endif
+
 %if %build_virt_top
 BuildRequires:  ocaml-curses-devel
 BuildRequires:  ocaml-extlib-devel
@@ -35,6 +40,7 @@ BuildRequires:  ocaml-csv-devel
 BuildRequires:  ocaml-calendar-devel
 %endif
 %endif
+
 BuildRequires:  libvirt-devel >= 0.2.1
 BuildRequires:  perl
 BuildRequires:  gawk
@@ -134,7 +140,7 @@ strip virt-ctrl/virt-ctrl.opt
 strip virt-top/virt-top.opt
 %endif
 %if %build_virt_df
-strip virt-top/virt-df.opt
+strip virt-df/virt-df.opt
 %endif
 %endif
 
@@ -219,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README TODO.virt-top ChangeLog
 %{_bindir}/virt-top
-%{_mandir}/man1/*.1.gz
+%{_mandir}/man1/virt-top.1.gz
 %endif
 
 
@@ -228,10 +234,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog
 %{_bindir}/virt-df
+# Because of a bug in the upstream package, this isn't built yet.
+#%{_mandir}/man1/virt-df.1.gz
 %endif
 
 
 %changelog
+* Tue Mar  4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.0-1
+- New upstream release 0.4.1.0.
+- Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0,
+  gnome-icon-theme.
+- Enable virt-df.
+
 * Sat Mar  1 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.0.3-3
 - Rebuild for ppc64.