rpms/ocaml-libvirt/devel .cvsignore, 1.12, 1.13 ocaml-libvirt.spec, 1.20, 1.21 sources, 1.12, 1.13
Richard W.M. Jones (rjones)
fedora-extras-commits at redhat.com
Thu Jun 5 19:52:48 UTC 2008
Author: rjones
Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260
Modified Files:
.cvsignore ocaml-libvirt.spec sources
Log Message:
* Thu Jun 5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.2.2-1
- New upstream version.
- Removed virt-ctrl, virt-df, virt-top subpackages, since these are
now separate Fedora packages.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 19 Mar 2008 12:09:18 -0000 1.12
+++ .cvsignore 5 Jun 2008 19:51:58 -0000 1.13
@@ -1 +1 @@
-ocaml-libvirt-0.4.1.1.tar.gz
+ocaml-libvirt-0.4.2.2.tar.gz
Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ocaml-libvirt.spec 20 May 2008 08:53:40 -0000 1.20
+++ ocaml-libvirt.spec 5 Jun 2008 19:51:58 -0000 1.21
@@ -3,14 +3,10 @@
# Select what subpackages to build.
%define build_mlvirsh 1
-%define build_virt_ctrl 0
-%define build_virt_top 0
-%define build_virt_df 0
-%define build_full_featured_virt_top 0
Name: ocaml-libvirt
-Version: 0.4.1.1
-Release: 4%{?dist}
+Version: 0.4.2.2
+Release: 1%{?dist}
Summary: OCaml binding for libvirt
Group: Development/Libraries
@@ -19,28 +15,10 @@
Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ocaml >= 3.10.1
+BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-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
@@ -76,50 +54,6 @@
%endif
-%if %build_virt_ctrl
-%package -n virt-ctrl
-Summary: OCaml virtualization graphical utility
-Group: Applications/Emulators
-License: GPLv2+
-
-
-%description -n virt-ctrl
-OCaml virtualization graphical utility.
-%endif
-
-
-%if %build_virt_top
-%package -n virt-top
-Summary: Utility like top(1) for displaying virtualization stats
-Group: Applications/Emulators
-License: GPLv2+
-
-
-%description -n virt-top
-virt-top is a 'top(1)'-like utility for showing stats of virtualized
-domains. Many keys and command line options are the same as for
-ordinary 'top'.
-
-It uses libvirt so it is capable of showing stats across a variety of
-different virtualization systems.
-%endif
-
-
-%if %build_virt_df
-%package -n virt-df
-Summary: Utility like df(1) for displaying disk space in guests
-Group: Applications/Emulators
-License: GPLv2+
-
-
-%description -n virt-df
-virt-df is a 'df(1)'-like utility for display disk space in guests.
-
-It uses libvirt so it is capable of showing stats across a variety of
-different virtualization systems.
-%endif
-
-
%prep
%setup -q
@@ -130,18 +64,6 @@
%if %opt
make opt
strip libvirt/dllmllibvirt.so
-%if %build_mlvirsh
-strip mlvirsh/mlvirsh.opt
-%endif
-%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-df/virt-df.opt
-%endif
%endif
@@ -154,32 +76,9 @@
mkdir -p $RPM_BUILD_ROOT%{_bindir}
make install
-%if %build_virt_top
-# Install virt-top manpage by hand for now.
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0644 virt-top/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1
-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_virt_ctrl
-rm -f $RPM_BUILD_ROOT%{_bindir}/virt-ctrl
-%endif
-%if !%build_virt_top
-rm -f $RPM_BUILD_ROOT%{_bindir}/virt-top
-%endif
-%if !%build_virt_df
-rm -f $RPM_BUILD_ROOT%{_bindir}/virt-df
-%endif
%clean
@@ -219,33 +118,12 @@
%endif
-%if %build_virt_ctrl
-%files -n virt-ctrl
-%defattr(-,root,root,-)
-%doc COPYING README ChangeLog
-%{_bindir}/virt-ctrl
-%endif
-
-
-%if %build_virt_top
-%files -n virt-top
-%defattr(-,root,root,-)
-%doc COPYING README TODO.virt-top ChangeLog
-%{_bindir}/virt-top
-%{_mandir}/man1/virt-top.1.gz
-%endif
-
-
-%if %build_virt_df
-%files -n virt-df
-%defattr(-,root,root,-)
-%doc COPYING README ChangeLog
-%{_bindir}/virt-df
-%{_mandir}/man1/virt-df.1.gz
-%endif
-
-
%changelog
+* Thu Jun 5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.2.2-1
+- New upstream version.
+- Removed virt-ctrl, virt-df, virt-top subpackages, since these are
+ now separate Fedora packages.
+
* Tue May 20 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.1.1-4
- Disable virt-top (bz 442871).
- Disable virt-ctrl (bz 442875).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 19 Mar 2008 12:09:18 -0000 1.12
+++ sources 5 Jun 2008 19:51:58 -0000 1.13
@@ -1 +1 @@
-f6651b76dd8508e7315ac1c228faa8f9 ocaml-libvirt-0.4.1.1.tar.gz
+b2c12530d8087721d29811d92f6057cc ocaml-libvirt-0.4.2.2.tar.gz
More information about the fedora-extras-commits
mailing list