rpms/ocaml-libvirt/F-8 .cvsignore, 1.8, 1.9 ocaml-libvirt.spec, 1.9, 1.10 sources, 1.8, 1.9
Richard W.M. Jones (rjones)
fedora-extras-commits at redhat.com
Wed Mar 19 12:01:26 UTC 2008
Author: rjones
Update of /cvs/pkgs/rpms/ocaml-libvirt/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4667/F-8
Modified Files:
.cvsignore ocaml-libvirt.spec sources
Log Message:
* Wed Mar 19 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.1.1-1
- New upstream release 0.4.1.1.
- Upstream URL has changed.
- Upstream mlvirtmanager now called virt-ctrl.
- BuildRequires slightly changed in new upstream.
- Mistakenly stripping virt-top/virt-df.opt (should be virt-df/virt-df.opt).
- Don't include virt-df manual page if not building it.
- Move configure to build section.
- Pass RPM_OPT_FLAGS.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/F-8/.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 19 Mar 2008 12:00:48 -0000 1.9
@@ -1 +1 @@
-ocaml-libvirt-0.3.3.0.tar.gz
+ocaml-libvirt-0.4.1.1.tar.gz
Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/F-8/ocaml-libvirt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-libvirt.spec 19 Oct 2007 15:47:01 -0000 1.9
+++ ocaml-libvirt.spec 19 Mar 2008 12:00:48 -0000 1.10
@@ -3,44 +3,49 @@
# 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: 2%{?dist}
+Version: 0.4.1.1
+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: 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.10.0-7
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
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -73,14 +78,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
@@ -119,10 +124,10 @@
%prep
%setup -q
-./configure --libdir=%{_libdir} --prefix=%{_prefix}
%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --prefix=%{_prefix}
make all doc
%if %opt
make opt
@@ -130,14 +135,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
@@ -158,11 +163,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
@@ -209,11 +221,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
@@ -222,7 +234,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
@@ -231,10 +243,21 @@
%defattr(-,root,root,-)
%doc COPYING README ChangeLog
%{_bindir}/virt-df
+%{_mandir}/man1/virt-df.1.gz
%endif
%changelog
+* Wed Mar 19 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.1.1-1
+- New upstream release 0.4.1.1.
+- Upstream URL has changed.
+- Upstream mlvirtmanager now called virt-ctrl.
+- BuildRequires slightly changed in new upstream.
+- Mistakenly stripping virt-top/virt-df.opt (should be virt-df/virt-df.opt).
+- Don't include virt-df manual page if not building it.
+- Move configure to build section.
+- Pass RPM_OPT_FLAGS.
+
* Fri Oct 19 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.3.0-2
- Mistake: BR is ocaml-calendar-devel.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/F-8/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 19 Mar 2008 12:00:48 -0000 1.9
@@ -1 +1 @@
-8787a13f315c62a650170e4d888ebccb ocaml-libvirt-0.3.3.0.tar.gz
+f6651b76dd8508e7315ac1c228faa8f9 ocaml-libvirt-0.4.1.1.tar.gz
More information about the fedora-extras-commits
mailing list