diff --git a/.gitignore b/.gitignore index 9b5e5f5..1dd53cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -virt-df-2.1.5.tar.gz +virt-df-2.1.1.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 1b0f3ec..0000000 --- a/dead.package +++ /dev/null @@ -1,2 +0,0 @@ -In Fedora 11 and above, this package has been rewritten using -libguestfs, and is now built as a subpackage of libguestfs. diff --git a/sources b/sources new file mode 100644 index 0000000..56d1c96 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +a50f8d1db626527664293a737e3827c1 virt-df-2.1.1.tar.gz diff --git a/virt-df-requires-bitmatch.patch b/virt-df-requires-bitmatch.patch new file mode 100644 index 0000000..bad9b57 --- /dev/null +++ b/virt-df-requires-bitmatch.patch @@ -0,0 +1,24 @@ +--- a/diskzip/Makefile.in Sun May 18 17:39:30 2008 +0100 ++++ b/diskzip/Makefile.in Sun May 18 23:38:18 2008 +0100 +@@ -38,7 +38,7 @@ OBJS := diskzip_gettext.cmo diskzip.cmo + OBJS := diskzip_gettext.cmo diskzip.cmo + XOBJS := $(OBJS:.cmo=.cmx) + +-SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo" ++SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo" + + OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX) + #OCAMLCLIBS := -linkpkg diskimage.cma + +--- a/lib/Makefile.in Sun May 18 17:39:30 2008 +0100 ++++ b/lib/Makefile.in Sun May 18 23:38:18 2008 +0100 +@@ -55,7 +55,7 @@ XOBJS := $(OBJS:.cmo=.cmx) + + #---------------------------------------------------------------------- + +-SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo" ++SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo" + + OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX) + #OCAMLCLIBS := -linkpkg + diff --git a/virt-df.spec b/virt-df.spec new file mode 100644 index 0000000..9f07f0d --- /dev/null +++ b/virt-df.spec @@ -0,0 +1,200 @@ +%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) +%define debug_package %{nil} + +Name: virt-df +Version: 2.1.1 +Release: 8%{?dist} +Summary: Utility like 'df' for virtual guests + +Group: Development/Libraries +License: GPLv2+ +URL: http://et.redhat.com/~rjones/virt-df/ +Source0: http://et.redhat.com/~rjones/virt-df/files/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch0: virt-df-requires-bitmatch.patch + +BuildRequires: ocaml >= 3.10.0 +BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-extlib-devel +BuildRequires: ocaml-csv-devel +BuildRequires: ocaml-findlib-devel +BuildRequires: ocaml-bitmatch-devel >= 0.9 +BuildRequires: ocaml-xml-light-devel +BuildRequires: ocaml-libvirt-devel + +# Non-OCaml BRs. +BuildRequires: libvirt-devel >= 0.2.1 +BuildRequires: perl +BuildRequires: gawk + +%define _use_internal_dependency_generator 0 +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh + +%description +Virt-df is df for virtual guests. Run the program on the host / dom0 +to display disk space used and available on all partitions on all +guests. + + +%prep +%setup -q +# http://hg.et.redhat.com/virt/applications/virt-df--devel?cs=00a35ad4c881 +%patch0 -p1 + + +%build +CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --prefix=%{_prefix} + +rm */.depend +make depend + +make all +%if %opt +make opt +strip virt-df/virt-df.opt +%endif + +# Force rebuild of man page. +rm virt-df/virt-df.1 +make -C virt-df virt-df.1 + + +%install +rm -rf $RPM_BUILD_ROOT +make -C virt-df DESTDIR=$RPM_BUILD_ROOT install + +# 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 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING README ChangeLog +%{_bindir}/virt-df +%{_mandir}/man1/virt-df.1* + + +%changelog +* Thu Jun 12 2008 Richard W.M. Jones - 2.1.1-8 +- Bump version to fix package EVR problems between branches + +* Thu May 22 2008 Richard W.M. Jones - 2.1.1-7 +- Remove ocaml-gettext dep, not available in F-9. + +* Sun May 18 2008 Richard W.M. Jones - 2.1.1-6 +- Include upstream cset 00a35ad4c881 which fixes build with + latest bitmatch. + +* Fri May 16 2008 Richard W.M. Jones - 2.1.1-5 +- Reenable ocaml-gettext-devel BR and get it working properly. +- Use find_lang to find PO files. +- +BR ocaml-fileutils-devel (not strictly needed, but a dependency + of gettext). +- +BR ocaml-camomile-data except on ppc64. + +* Tue May 13 2008 Richard W.M. Jones - 2.1.1-1 +- New upstream version 2.1.1. +- Needs bitmatch >= 0.9. + +* Thu May 1 2008 Richard W.M. Jones - 2.0.2-1 +- New upstream version 2.0.2. +- Don't depend on ocaml-gettext, it's not used at the moment. +- Don't gzip the manpage, it happens automagically. +- This version needs bitmatch >= 0.5. +- +BR ocaml-xml-light-devel +- +BR ocaml-camlp4-devel + +* Thu Apr 17 2008 Richard W.M. Jones - 2.0.0-3 +- Build with additional CSV support. + +* Thu Apr 17 2008 Richard W.M. Jones - 2.0.0-2 +- New upstream release 2.0.0. +- BR ocaml-libvirt-devel. + +* Tue Mar 19 2008 Richard W.M. Jones - 0.4.1.1-1 +- New upstream release 0.4.1.1. +- Move configure to build section. +- Pass RPM_OPT_FLAGS. + +* Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-2 +- Fix source URL. +- Install virt-df manpage. + +* Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 +- New upstream release 0.4.1.0. +- Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, + ocaml-dbus-devel. +- Enable virt-df. + +* Sat Mar 1 2008 Richard W.M. Jones - 0.4.0.3-3 +- Rebuild for ppc64. + +* Wed Feb 13 2008 Richard W.M. Jones - 0.4.0.3-2 +- Add BR gtk2-devel + +* Tue Feb 12 2008 Richard W.M. Jones - 0.4.0.3-1 +- New upstream version 0.4.0.3. +- Rebuild for OCaml 3.10.1. + +* Tue Nov 20 2007 Richard W.M. Jones - 0.3.3.4-1 +- New upstream release 0.3.3.4. +- Upstream website is now http://libvirt.org/ocaml/ + +* Fri Oct 19 2007 Richard W.M. Jones - 0.3.3.0-2 +- Mistake: BR is ocaml-calendar-devel. + +* Fri Oct 19 2007 Richard W.M. Jones - 0.3.3.0-1 +- New upstream release 0.3.3.0. +- Added support for virt-df, but disabled it by default. +- +BR ocaml-calendar. + +* Mon Sep 24 2007 Richard W.M. Jones - 0.3.2.8-1 +- New upstream release 0.3.2.8. + +* Thu Sep 20 2007 Richard W.M. Jones - 0.3.2.7-1 +- New upstream release 0.3.2.7. +- Ship the upstream ChangeLog file. + +* Thu Sep 6 2007 Richard W.M. Jones - 0.3.2.6-2 +- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides + scripts. + +* Thu Sep 6 2007 Richard W.M. Jones - 0.3.2.6-1 +- New upstream version 0.3.2.6. + +* Wed Aug 29 2007 Richard W.M. Jones - 0.3.2.5-1 +- New upstream version 0.3.2.5. +- Keep TODO out of the main package, but add (renamed) TODO.libvirt and + TODO.virt-top to the devel and virt-top packages respectively. +- Add BR gawk. + +* Thu Aug 23 2007 Richard W.M. Jones - 0.3.2.4-1 +- New upstream version 0.3.2.4. + +* Thu Aug 23 2007 Richard W.M. Jones - 0.3.2.3-2 +- build_* macros so we can choose what subpackages to build. + +* Thu Aug 23 2007 Richard W.M. Jones - 0.3.2.3-1 +- Upstream version 0.3.2.3. +- Add missing BR libvirt-devel. + +* Wed Aug 22 2007 Richard W.M. Jones - 0.3.2.2-1 +- Upstream version 0.3.2.2. + +* Wed Aug 22 2007 Richard W.M. Jones - 0.3.2.1-2 +- Fix unclosed if-statement in spec file. + +* Wed Aug 22 2007 Richard W.M. Jones - 0.3.2.1-1 +- Upstream version 0.3.2.1. +- Put HTML documentation in -devel package. + +* Mon Aug 6 2007 Richard W.M. Jones - 0.3.1.2-1 +- Initial RPM release.