rpms/libguestfs/devel .cvsignore, 1.62, 1.63 libguestfs.spec, 1.152, 1.153 sources, 1.62, 1.63 libguestfs-1.0.84-supermin-split-quoting.patch, 1.1, NONE

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11164

Modified Files:
	.cvsignore libguestfs.spec sources 
Removed Files:
	libguestfs-1.0.84-supermin-split-quoting.patch 
Log Message:
- New upstream version 1.0.85.
- Remove hivex, now a separate upstream project and package.
- Remove supermin quoting patch, now upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	12 Feb 2010 20:01:22 -0000	1.62
+++ .cvsignore	1 Mar 2010 14:44:00 -0000	1.63
@@ -1 +1 @@
-libguestfs-1.0.84.tar.gz
+libguestfs-1.0.85.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- libguestfs.spec	1 Mar 2010 11:54:11 -0000	1.152
+++ libguestfs.spec	1 Mar 2010 14:44:01 -0000	1.153
@@ -41,8 +41,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.0.84
-Release:       6%{?dist}
+Version:       1.0.85
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,15 +52,11 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
-# RHBZ#566511 and RHBZ#566512.  Not upstream yet.  Needs to go
-# upstream in both libguestfs and febootstrap once we have done more
-# testing, and worked out if this works with older versions of bash.
-Patch1:        libguestfs-1.0.84-supermin-split-quoting.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 2.6
+BuildRequires: hivex-devel >= 1.2.0
 BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
 BuildRequires: genisoimage
@@ -218,6 +214,7 @@ Requires:      %{name} = %{epoch}:%{vers
 Requires:      guestfish
 Requires:      perl-Sys-Virt
 Requires:      perl-XML-Writer
+Requires:      hivex
 
 # Obsolete and replace earlier packages.
 Provides:      virt-cat = %{epoch}:%{version}-%{release}
@@ -377,7 +374,6 @@ Requires:      jpackage-utils
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -466,8 +462,6 @@ rmdir keep
 # Delete static libraries, libtool files.
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
-rm $RPM_BUILD_ROOT%{_libdir}/libhivex.a
-rm $RPM_BUILD_ROOT%{_libdir}/libhivex.la
 
 # Clean up the examples/ directory which will get installed in %doc.
 # Note we can't delete the original examples/Makefile because that
@@ -530,18 +524,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%{_bindir}/hivexget
-%{_bindir}/hivexml
-%{_bindir}/hivexsh
 %{_bindir}/libguestfs-supermin-helper
 %{_bindir}/libguestfs-test-tool
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
-%{_libdir}/libhivex.so.*
 %{_libexecdir}/libguestfs-test-tool-helper
-%{_mandir}/man1/hivexget.1*
-%{_mandir}/man1/hivexml.1*
-%{_mandir}/man1/hivexsh.1*
 %{_mandir}/man1/libguestfs-test-tool.1*
 
 
@@ -550,10 +537,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
 %doc installed-docs/*
 %{_libdir}/libguestfs.so
-%{_libdir}/libhivex.so
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
-%{_mandir}/man3/hivex.3*
 %{_includedir}/guestfs.h
 %{_includedir}/guestfs-actions.h
 %{_includedir}/guestfs-structs.h
@@ -661,6 +646,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar  1 2010 Richard W.M. Jones <rjones at redhat.com> - 1:1.0.85-1
+- New upstream version 1.0.85.
+- Remove hivex, now a separate upstream project and package.
+- Remove supermin quoting patch, now upstream.
+
 * Mon Mar  1 2010 Richard W.M. Jones <rjones at redhat.com> - 1:1.0.84-6
 - Fix quoting in supermin-split script (RHBZ#566511).
 - Don't include bogus './builddir' entries in supermin hostfiles


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	12 Feb 2010 20:01:22 -0000	1.62
+++ sources	1 Mar 2010 14:44:01 -0000	1.63
@@ -1 +1 @@
-033bab79dc02a6d731484fbbcfe7b90b  libguestfs-1.0.84.tar.gz
+1712af8f2abf7ada2ba973af4968a5ee  libguestfs-1.0.85.tar.gz


--- libguestfs-1.0.84-supermin-split-quoting.patch DELETED ---