[libguestfs] - New upstream version 1.11.20. - Replace standard README file with one suited for Fedora. - Add gue

Tue Jul 19 18:15:16 UTC 2011

commit f8bb0826fe1b2fe7e76913329f1f5520a2da8d82
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jul 19 19:12:46 2011 +0100

    - New upstream version 1.11.20.
    - Replace standard README file with one suited for Fedora.
    - Add guestfs-java(3) manpage to libguestfs-java-devel package.

 .gitignore            |    1 +
 README-replacement.in |   38 ++++++++++++++++++++++++++++++++++++++
 libguestfs.spec       |   30 +++++++++++++++++++++---------
 sources               |    2 +-
 4 files changed, 61 insertions(+), 10 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index adbe6b0..4cc41eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.11.17.tar.gz
 /libguestfs-1.11.18.tar.gz
 /libguestfs-1.11.19.tar.gz
+/libguestfs-1.11.20.tar.gz
diff --git a/README-replacement.in b/README-replacement.in
new file mode 100644
index 0000000..e5b6c19
--- /dev/null
+++ b/README-replacement.in
@@ -0,0 +1,38 @@
+Libguestfs is a set of tools and a library for accessing and modifying
+guest disk images.  For more information see the home page:
+
+  http://libguestfs.org/
+
+For discussion, development, patches, etc. please use the mailing
+list:
+
+  http://www.redhat.com/mailman/listinfo/libguestfs
+
+This Fedora package comes with a lot of help and examples to get you
+started.
+
+The first places to start are the manual pages.  Type:
+
+  man guestfs
+  man guestfish
+  man virt-cat   # and other virt-* tools
+
+If you install the libguestfs-devel package, then in the
+/usr/share/doc/libguestfs-devel- at VERSION@/ directory you will also
+find:
+
+ - BUGS: list of open bugs in this version
+
+ - ChangeLog: the detailed list of changes in this version
+
+ - RELEASE-NOTES: the release notes for the last major version
+
+ - ROADMAP: the roadmap for future versions
+
+ - TODO: ideas for extending libguestfs
+
+ - *.c: example C programs using the API
+
+ - *.xml: example virt-inspector output
+
+ - *.rng: virt-inspector RelaxNG schema
diff --git a/libguestfs.spec b/libguestfs.spec
index cd2c8fc..1005471 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,7 +29,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.11.19
+Version:       1.11.20
 Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
@@ -156,6 +156,9 @@ Source1:       libguestfs-find-requires.sh
 Source2:       guestfsd.service
 Source3:       99-guestfsd.rules
 
+# Replacement README file for Fedora users.
+Source4:       README-replacement.in
+
 
 %description
 Libguestfs is a library for accessing and modifying guest disk images.
@@ -496,6 +499,11 @@ for %{name}.
 
 mkdir -p daemon/m4
 
+# Replace developer-specific README that ships with libguestfs, with
+# our replacement file.
+mv README README.orig
+sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README
+
 
 %build
 %if %{buildnet}
@@ -677,7 +685,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING README
 %{_bindir}/libguestfs-test-tool
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
@@ -700,6 +708,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n guestfish
 %defattr(-,root,root,-)
+%doc README
 %{_bindir}/guestfish
 %{_mandir}/man1/guestfish.1*
 %{_bindir}/virt-copy-in
@@ -716,13 +725,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mount
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING README
 %{_bindir}/guestmount
 %{_mandir}/man1/guestmount.1*
 
 
 %files tools-c
 %defattr(-,root,root,-)
+%doc README
 %{_bindir}/virt-cat
 %{_mandir}/man1/virt-cat.1*
 %{_bindir}/virt-df
@@ -742,6 +752,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(-,root,root,-)
+%doc README
 %{_bindir}/virt-list-filesystems
 %{_mandir}/man1/virt-list-filesystems.1*
 %{_bindir}/virt-list-partitions
@@ -758,6 +769,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files live-service
 %defattr(-,root,root,-)
+%doc COPYING README
 %{_sbindir}/guestfsd
 %{_unitdir}/guestfsd.service
 %{_sysconfdir}/udev/rules.d/99-guestfsd.rules
@@ -765,7 +777,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ocaml-%{name}
 %defattr(-,root,root,-)
-%doc README
 %{_libdir}/ocaml/guestfs
 %exclude %{_libdir}/ocaml/guestfs/*.a
 %exclude %{_libdir}/ocaml/guestfs/*.cmxa
@@ -796,7 +807,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-%{name}
 %defattr(-,root,root,-)
-%doc README
 %doc python/examples/*.py
 %{python_sitearch}/*
 %{python_sitelib}/*.py
@@ -807,7 +817,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-%{name}
 %defattr(-,root,root,-)
-%doc README
 %doc ruby/examples/*.rb
 %doc ruby/doc/site/*
 %{ruby_sitelib}/guestfs.rb
@@ -817,20 +826,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files java
 %defattr(-,root,root,-)
-%doc README
 %{_libdir}/libguestfs_jni*.so.*
 %{_datadir}/java/*.jar
 
 
 %files java-devel
 %defattr(-,root,root,-)
-%doc README
 %{_libdir}/libguestfs_jni*.so
+%{_mandir}/man3/guestfs-java.3*
 
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc README
 %{_datadir}/javadoc/%{name}-java-%{version}
 
 
@@ -849,6 +856,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 19 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.11.20-1
+- New upstream version 1.11.20.
+- Replace standard README file with one suited for Fedora.
+- Add guestfs-java(3) manpage to libguestfs-java-devel package.
+
 * Mon Jul 18 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.11.19-1
 - New upstream version 1.11.19.
 - Remove upstream patch.
diff --git a/sources b/sources
index d847eab..84a674c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac937d6d2518088dbf07f45feb4a27b9  libguestfs-1.11.19.tar.gz
+6dcbd15e9a4f07a2a34900635f820583  libguestfs-1.11.20.tar.gz
