rpms/ocaml-libvirt/EL-5 .cvsignore, 1.8, 1.9 ocaml-libvirt.spec, 1.13, 1.14 sources, 1.8, 1.9

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24245/EL-5

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Wed Mar 12 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.1.0-1
- New upstream release 0.4.1.0.
- New upstream URL and source location.
- Upstream renamed mlvirtmanager to virt-ctrl.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Oct 2007 15:22:32 -0000	1.8
+++ .cvsignore	12 Mar 2008 12:37:04 -0000	1.9
@@ -1 +1 @@
-ocaml-libvirt-0.3.3.0.tar.gz
+ocaml-libvirt-0.4.1.0.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/ocaml-libvirt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml-libvirt.spec	12 Dec 2007 16:08:14 -0000	1.13
+++ ocaml-libvirt.spec	12 Mar 2008 12:37:04 -0000	1.14
@@ -3,47 +3,50 @@
 
 # Select what subpackages to build.
 %define build_mlvirsh                1
-%define build_mlvirtmanager          0
+%define build_virt_ctrl              0
 %define build_virt_top               1
 %define build_virt_df                0
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.3.0
-Release:        6%{?dist}
+Version:        0.4.1.0
+Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
 License:        LGPLv2+
-URL:            http://et.redhat.com/~rjones/ocaml-libvirt/
-Source0:        http://et.redhat.com/~rjones/ocaml-libvirt/%{name}-%{version}.tar.gz
+URL:            http://libvirt.org/ocaml/
+Source0:        http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    ppc
-ExcludeArch:    ppc64
 
-# Note for people building from this spec file:
-# These BR's can be found in Fedora development, or here:
-# http://www.annexia.org/tmp/ocaml/
 BuildRequires:  ocaml >= 3.09.3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-extlib-devel
-%if %build_mlvirtmanager
-BuildRequires:  ocaml-lablgtk-devel
+
+%if %build_virt_ctrl
+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
 %if %build_full_featured_virt_top
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  ocaml-csv-devel
 BuildRequires:  ocaml-calendar-devel
 %endif
 %endif
+
 BuildRequires:  libvirt-devel >= 0.2.1
 BuildRequires:  perl
 BuildRequires:  gawk
 BuildRequires:  ncurses-devel
 
+
 %description
 OCaml binding for libvirt.
 
@@ -71,14 +74,14 @@
 %endif
 
 
-%if %build_mlvirtmanager
-%package        -n mlvirtmanager
+%if %build_virt_ctrl
+%package        -n virt-ctrl
 Summary:        OCaml virtualization graphical utility
 Group:          Applications/Emulators
 License:        GPLv2+
 
 
-%description    -n mlvirtmanager
+%description    -n virt-ctrl
 OCaml virtualization graphical utility.
 %endif
 
@@ -128,14 +131,14 @@
 %if %build_mlvirsh
 strip mlvirsh/mlvirsh.opt
 %endif
-%if %build_mlvirtmanager
-strip mlvirtmanager/mlvirtmanager.opt
+%if %build_virt_ctrl
+strip virt-ctrl/virt-ctrl.opt
 %endif
 %if %build_virt_top
 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
 
@@ -156,11 +159,18 @@
 gzip $RPM_BUILD_ROOT%{_mandir}/man1/virt-top.1
 %endif
 
+%if %build_virt_df
+# Install virt-df manpage by hand for now.
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 0644 virt-df/virt-df.1 $RPM_BUILD_ROOT%{_mandir}/man1
+gzip $RPM_BUILD_ROOT%{_mandir}/man1/virt-df.1
+%endif
+
 %if !%build_mlvirsh
 rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirsh
 %endif
-%if !%build_mlvirtmanager
-rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirtmanager
+%if !%build_virt_ctrl
+rm -f $RPM_BUILD_ROOT%{_bindir}/virt-ctrl
 %endif
 %if !%build_virt_top
 rm -f $RPM_BUILD_ROOT%{_bindir}/virt-top
@@ -207,11 +217,11 @@
 %endif
 
 
-%if %build_mlvirtmanager
-%files -n mlvirtmanager
+%if %build_virt_ctrl
+%files -n virt-ctrl
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog
-%{_bindir}/mlvirtmanager
+%{_bindir}/virt-ctrl
 %endif
 
 
@@ -220,7 +230,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README TODO.virt-top ChangeLog
 %{_bindir}/virt-top
-%{_mandir}/man1/*.1.gz
+%{_mandir}/man1/virt-top.1.gz
 %endif
 
 
@@ -229,10 +239,16 @@
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog
 %{_bindir}/virt-df
+%{_mandir}/man1/virt-df.1.gz
 %endif
 
 
 %changelog
+* Wed Mar 12 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.1.0-1
+- New upstream release 0.4.1.0.
+- New upstream URL and source location.
+- Upstream renamed mlvirtmanager to virt-ctrl.
+
 * Wed Dec 12 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.3.0-6
 - BuildRequires ncurses-devel on RHEL.
 - ExcludeArch ppc.  libvirt is missing from RHEL on ppc.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Oct 2007 15:22:32 -0000	1.8
+++ sources	12 Mar 2008 12:37:04 -0000	1.9
@@ -1 +1 @@
-8787a13f315c62a650170e4d888ebccb  ocaml-libvirt-0.3.3.0.tar.gz
+d0798559af74524a58d98b523d36744e  ocaml-libvirt-0.4.1.0.tar.gz