From f14b2b0ccd50c8a791236a7f0d2b5e5dd75f6cf0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Oct 2009 14:54:45 +0000 Subject: [PATCH] - New upstream release 1.0.73. - OCaml library now depends on xml-light. - Deal with installed documentation. --- .cvsignore | 2 +- libguestfs.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4088e95..8d61c20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libguestfs-1.0.72.tar.gz +libguestfs-1.0.73.tar.gz diff --git a/libguestfs.spec b/libguestfs.spec index fc095a2..ee19a75 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -4,8 +4,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.0.72 -Release: 2%{?dist} +Version: 1.0.73 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -50,6 +50,7 @@ Requires: grub, ntfsprogs # different languages: BuildRequires: ocaml BuildRequires: ocaml-findlib-devel +BuildRequires: ocaml-xml-light-devel BuildRequires: perl-devel BuildRequires: perl-Test-Simple BuildRequires: perl-Test-Pod @@ -413,6 +414,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.la # Generator shouldn't be executable when we distribute it. chmod -x src/generator.ml +# Move installed documentation back to the source directory so +# we can install it using a %%doc rule. +mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs + # Find locale files. %find_lang %{name} @@ -441,6 +446,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css %doc src/generator.ml +%doc installed-docs/* %{_libdir}/libguestfs.so %{_mandir}/man3/guestfs.3* %{_mandir}/man3/libguestfs.3* @@ -536,6 +542,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 14 2009 Richard W.M. Jones - 1.0.73-1 +- New upstream release 1.0.73. +- OCaml library now depends on xml-light. +- Deal with installed documentation. + * Tue Sep 29 2009 Richard W.M. Jones - 1.0.72-2 - Force rebuild. diff --git a/sources b/sources index 386e8c1..c87b307 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6c66e405e34c256c05860cb25801a0d libguestfs-1.0.72.tar.gz +749041818f250f50f4ed8afbfc0fc568 libguestfs-1.0.73.tar.gz