- New upstream version 1.0.85.

- Remove hivex, now a separate upstream project and package.
- Remove supermin quoting patch, now upstream.
This commit is contained in:
Richard W.M. Jones 2010-03-01 14:44:01 +00:00
parent 7cb911a031
commit 3a8f9fb19e
4 changed files with 11 additions and 87 deletions

View File

@ -1 +1 @@
libguestfs-1.0.84.tar.gz libguestfs-1.0.85.tar.gz

View File

@ -1,66 +0,0 @@
--- libguestfs-1.0.84.orig/appliance/supermin-split.sh.in 2010-01-28 09:58:20.000000000 +0000
+++ libguestfs-1.0.84.rhbz566512/appliance/supermin-split.sh.in 2010-03-01 11:43:20.647728435 +0000
@@ -51,17 +51,27 @@
dir=$(dirname "$path")
file=$(basename "$path")
+ # For quoting problems with the bash =~ operator, see bash FAQ
+ # question E14 here http://tiswww.case.edu/php/chet/bash/FAQ and
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487387#25
+ # (RHBZ#566511).
+
# All we're going to keep are the special files /init, the daemon,
# configuration files (/etc), devices and modifiable stuff (/var).
if [ "$path" = "./init" -o "$file" = "guestfsd" ]; then
echo "$path" >&5
- elif [[ "$path" =~ '^\./etc' || "$path" =~ '^./dev' || "$path" =~ '^\./var' ]]; then
+ elif [[ "$path" =~ ^\./etc || "$path" =~ ^./dev || "$path" =~ ^\./var ]]; then
echo "$path" >&5
# Kernel modules are always copied in from the host, including all
# the dependency files.
- elif [[ "$path" =~ '^\./lib/modules/' ]]; then
+ elif [[ "$path" =~ ^\./lib/modules/ ]]; then
+ :
+
+ # On mock/Koji, exclude bogus /builddir directory which for some
+ # reason contains some yum temporary files (RHBZ#566512).
+ elif [[ "$path" =~ ^\./builddir ]]; then
:
elif [ -d "$path" ]; then
@@ -71,27 +81,27 @@
# Some libraries need fixed version numbers replaced by wildcards.
- elif [[ "$file" =~ '^ld-[.0-9]+\.so$' ]]; then
+ elif [[ "$file" =~ ^ld-[.0-9]+\.so$ ]]; then
echo "$dir/ld-*.so" >&6
# Special case for libbfd
- elif [[ "$file" =~ '^libbfd-.*\.so$' ]]; then
+ elif [[ "$file" =~ ^libbfd-.*\.so$ ]]; then
echo "$dir/libbfd-*.so" >&6
# Special case for libgcc_s-<gccversion>-<date>.so.N
- elif [[ "$file" =~ '^libgcc_s-.*\.so\.([0-9]+)$' ]]; then
+ elif [[ "$file" =~ ^libgcc_s-.*\.so\.([0-9]+)$ ]]; then
echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6
# libfoo-1.2.3.so
- elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so$' ]]; then
+ elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so$ ]]; then
echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6
# libfoo-1.2.3.so.1.2.3 (but NOT '*.so.N')
- elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' ]]; then
+ elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so\.([0-9]+)\. ]]; then
echo "$dir/lib${BASH_REMATCH[1]}-*.so.${BASH_REMATCH[2]}.*" >&6
# libfoo.so.1.2.3 (but NOT '*.so.N')
- elif [[ "$file" =~ '^lib(.*)\.so\.([0-9]+)\.' ]]; then
+ elif [[ "$file" =~ ^lib(.*)\.so\.([0-9]+)\. ]]; then
echo "$dir/lib${BASH_REMATCH[1]}.so.${BASH_REMATCH[2]}.*" >&6
else

View File

@ -41,8 +41,8 @@
Summary: Access and modify virtual machine disk images Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.0.84 Version: 1.0.85
Release: 6%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -52,15 +52,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Disable FUSE tests, not supported in Koji at the moment. # Disable FUSE tests, not supported in Koji at the moment.
Patch0: libguestfs-1.0.79-no-fuse-test.patch 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: # Basic build requirements:
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text BuildRequires: /usr/bin/pod2text
BuildRequires: febootstrap >= 2.6 BuildRequires: febootstrap >= 2.6
BuildRequires: hivex-devel >= 1.2.0
BuildRequires: augeas-devel >= 0.5.0 BuildRequires: augeas-devel >= 0.5.0
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: genisoimage BuildRequires: genisoimage
@ -218,6 +214,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: guestfish Requires: guestfish
Requires: perl-Sys-Virt Requires: perl-Sys-Virt
Requires: perl-XML-Writer Requires: perl-XML-Writer
Requires: hivex
# Obsolete and replace earlier packages. # Obsolete and replace earlier packages.
Provides: virt-cat = %{epoch}:%{version}-%{release} Provides: virt-cat = %{epoch}:%{version}-%{release}
@ -377,7 +374,6 @@ Requires: jpackage-utils
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
mkdir -p daemon/m4 mkdir -p daemon/m4
@ -466,8 +462,6 @@ rmdir keep
# Delete static libraries, libtool files. # Delete static libraries, libtool files.
rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la 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. # Clean up the examples/ directory which will get installed in %doc.
# Note we can't delete the original examples/Makefile because that # Note we can't delete the original examples/Makefile because that
@ -530,18 +524,11 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING %doc COPYING
%{_bindir}/hivexget
%{_bindir}/hivexml
%{_bindir}/hivexsh
%{_bindir}/libguestfs-supermin-helper %{_bindir}/libguestfs-supermin-helper
%{_bindir}/libguestfs-test-tool %{_bindir}/libguestfs-test-tool
%{_libdir}/guestfs/ %{_libdir}/guestfs/
%{_libdir}/libguestfs.so.* %{_libdir}/libguestfs.so.*
%{_libdir}/libhivex.so.*
%{_libexecdir}/libguestfs-test-tool-helper %{_libexecdir}/libguestfs-test-tool-helper
%{_mandir}/man1/hivexget.1*
%{_mandir}/man1/hivexml.1*
%{_mandir}/man1/hivexsh.1*
%{_mandir}/man1/libguestfs-test-tool.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 ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
%doc installed-docs/* %doc installed-docs/*
%{_libdir}/libguestfs.so %{_libdir}/libguestfs.so
%{_libdir}/libhivex.so
%{_mandir}/man3/guestfs.3* %{_mandir}/man3/guestfs.3*
%{_mandir}/man3/libguestfs.3* %{_mandir}/man3/libguestfs.3*
%{_mandir}/man3/hivex.3*
%{_includedir}/guestfs.h %{_includedir}/guestfs.h
%{_includedir}/guestfs-actions.h %{_includedir}/guestfs-actions.h
%{_includedir}/guestfs-structs.h %{_includedir}/guestfs-structs.h
@ -661,6 +646,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Mar 1 2010 Richard W.M. Jones <rjones@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@redhat.com> - 1:1.0.84-6 * Mon Mar 1 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-6
- Fix quoting in supermin-split script (RHBZ#566511). - Fix quoting in supermin-split script (RHBZ#566511).
- Don't include bogus './builddir' entries in supermin hostfiles - Don't include bogus './builddir' entries in supermin hostfiles

View File

@ -1 +1 @@
033bab79dc02a6d731484fbbcfe7b90b libguestfs-1.0.84.tar.gz 1712af8f2abf7ada2ba973af4968a5ee libguestfs-1.0.85.tar.gz