# If you have trouble building locally ('make local') try adding

#   %libguestfs_buildnet 1

# to your ~/.rpmmacros file.

# Enable to build using a network repo

# Default is disabled

%if %{defined libguestfs_buildnet}

%global buildnet %{libguestfs_buildnet}

%else

%global buildnet 0

%endif 

# Enable to make the appliance use virtio_blk

# Default is enabled

%if %{defined libguestfs_virtio}

%global with_virtio %{libguestfs_virtio}

%else

%global with_virtio 1

%endif 

# Mirror and updates repositories to use if building with network repo

%if %{defined libguestfs_mirror}

%global mirror %{libguestfs_mirror}

%else

%global mirror http://mirror.centos.org/centos-5/5.4/os/%{_arch}/

%endif

%if %{defined libguestfs_updates}

%global updates %{libguestfs_updates}

%else

%global updates none

%endif

# Enable to run tests during check

# Default is enabled

%if %{defined libguestfs_runtests}

%global runtests %{libguestfs_runtests}

%else

%global runtests 1

%endif

Summary:       Access and modify virtual machine disk images

Name:          libguestfs

Epoch:         1

Version:       1.2.2

Release:       1%{?dist}.3

License:       LGPLv2+

Group:         Development/Libraries

URL:           http://libguestfs.org/

Source0:       http://libguestfs.org/download/%{name}-%{version}.tar.gz

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root

# Currently fails on PPC because:

# "No Package Found for kernel"

ExclusiveArch: %{ix86} x86_64

# Disable FUSE tests, not supported in Koji at the moment.

Patch0:        libguestfs-1.0.79-no-fuse-test.patch

# Basic build requirements:

BuildRequires: /usr/bin/pod2man

BuildRequires: /usr/bin/pod2text

BuildRequires: febootstrap >= 2.6

BuildRequires: hivex-devel >= 1.2.1

BuildRequires: augeas-devel >= 0.5.0

BuildRequires: readline-devel

BuildRequires: mkisofs

BuildRequires: libxml2-devel

# Should depend on KVM here, however:

# https://fedorahosted.org/rel-eng/ticket/2982#comment:3

%ifarch %{ix86} x86_64

BuildRequires: qemu-system-x86 >= 0.10.5

%endif

%ifarch ppc ppc64

BuildRequires: qemu-system-ppc >= 0.10.5

%endif

BuildRequires: createrepo

BuildRequires: libselinux-devel

BuildRequires: fuse-devel

# This is only needed for RHEL 5 because readline-devel doesn't

# properly depend on it, but doesn't do any harm on other platforms:

BuildRequires: ncurses-devel

# Build requirements for the appliance (see 'make.sh.in' in the source):

BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g

BuildRequires: MAKEDEV, net-tools, augeas-libs, file

BuildRequires: module-init-tools, procps, strace, iputils

BuildRequires: dosfstools, zerofree, lsof, scrub, libselinux

BuildRequires: e4fsprogs

%ifarch %{ix86} x86_64

BuildRequires: grub, ntfsprogs

%endif

# Must match the above set of BuildRequires exactly!

Requires:      kernel, bash, coreutils, lvm2, ntfs-3g

Requires:      MAKEDEV, net-tools, augeas-libs, file

Requires:      module-init-tools, procps, strace, iputils

Requires:      dosfstools, zerofree, lsof, scrub, libselinux

Requires:      e4fsprogs

%ifarch %{ix86} x86_64

Requires:      grub, ntfsprogs

%endif

# These are only required if you want to build the bindings for

# different languages:

BuildRequires: ocaml

BuildRequires: ocaml-findlib-devel

BuildRequires: ocaml-xml-light-devel

#BuildRequires: perl-devel

#BuildRequires: perl-Test-Simple

BuildRequires: perl-Test-Pod

BuildRequires: perl-Test-Pod-Coverage

#BuildRequires: perl-ExtUtils-MakeMaker

BuildRequires: perl-XML-Writer

BuildRequires: perl-libintl

BuildRequires: python-devel

BuildRequires: ruby-devel

BuildRequires: rubygem-rake

BuildRequires: java >= 1.5.0

BuildRequires: jpackage-utils

BuildRequires: java-devel

# For libguestfs-tools:

BuildRequires: perl-Sys-Virt

# Runtime requires:

%ifarch %{ix86} x86_64

Requires:      qemu-system-x86 >= 0.10.5

%endif

%ifarch ppc ppc64

Requires:      qemu-system-ppc >= 0.10.5

%endif

# For libguestfs-test-tool.

Requires:      mkisofs

# Provide our own custom requires for the supermin appliance.

Source1:       libguestfs-find-requires.sh

%global _use_internal_dependency_generator 0

%global __find_provides /usr/lib/rpm/find-provides

%global __find_requires %{SOURCE1} /usr/lib/rpm/find-requires

%description

Libguestfs is a library for accessing and modifying guest disk images.

Amongst the things this is good for: making batch configuration

changes to guests, getting disk used/free statistics (see also:

virt-df), migrating between virtualization systems (see also:

virt-p2v), performing partial backups, performing partial guest

clones, cloning guests and changing registry/UUID/hostname info, and

much else besides.

Libguestfs uses Linux kernel and qemu code, and can access any type of

guest filesystem that Linux and qemu can, including but not limited

to: ext2/3/4, btrfs, FAT and NTFS, LVM, many different disk partition

schemes, qcow, qcow2, vmdk.

Libguestfs provides ways to enumerate guest storage (eg. partitions,

LVs, what filesystem is in each LV, etc.).  It can also run commands

in the context of the guest.

Libguestfs is a library that can be linked with C and C++ management

programs.

See also the 'guestfish' package for shell scripting and command line

access, and '%{name}-mount' for mounting guest filesystems on the

host using FUSE.

For Perl bindings, see 'perl-libguestfs'.

For OCaml bindings, see 'ocaml-libguestfs-devel'.

For Python bindings, see 'python-libguestfs'.

For Ruby bindings, see 'ruby-libguestfs'.

For Java bindings, see 'libguestfs-java-devel'.

%package devel

Summary:       Development tools and libraries for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      pkgconfig

%description devel

%{name}-devel contains development tools and libraries

for %{name}.

%package -n guestfish

Summary:       Shell for accessing and modifying virtual machine disk images

Group:         Development/Tools

License:       GPLv2+

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      /usr/bin/pod2text

Requires:      virt-inspector

%description -n guestfish

Guestfish is the Filesystem Interactive SHell, for accessing and

modifying virtual machine disk images from the command line and shell

scripts.

%package mount

Summary:       Mount guest filesystems on the host using FUSE and libguestfs

Group:         Development/Tools

License:       GPLv2+

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      virt-inspector

%description mount

The guestmount command lets you mount guest filesystems on the

host using FUSE and %{name}.

%package tools

Summary:       System administration tools for virtual machines

Group:         Development/Tools

License:       GPLv2+

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      guestfish

Requires:      perl-Sys-Virt

Requires:      perl-XML-Writer

Requires:      hivex >= 1.2.1

# Obsolete and replace earlier packages.

Provides:      virt-cat = %{epoch}:%{version}-%{release}

Obsoletes:     virt-cat < %{epoch}:%{version}-%{release}

Provides:      virt-df = %{epoch}:%{version}-%{release}

Obsoletes:     virt-df < %{epoch}:%{version}-%{release}

Provides:      virt-inspector = %{epoch}:%{version}-%{release}

Obsoletes:     virt-inspector < %{epoch}:%{version}-%{release}

# RHBZ#514309

Provides:      virt-df2 = %{epoch}:%{version}-%{release}

Obsoletes:     virt-df2 < %{epoch}:%{version}-%{release}

# These were never packages:

Provides:      virt-edit = %{epoch}:%{version}-%{release}

Provides:      virt-rescue = %{epoch}:%{version}-%{release}

%description tools

This package contains miscellaneous system administrator command line

tools for virtual machines.

Virt-cat is a command line tool to display the contents of a file in a

virtual machine.

Virt-df is a command line tool to display free space on virtual

machine filesystems.  Unlike other tools, it doesn’t just display the

amount of space allocated to a virtual machine, but can look inside

the virtual machine to see how much space is really being used.  It is

like the df(1) command, but for virtual machines, except that it also

works for Windows virtual machines.

Virt-edit is a command line tool to edit the contents of a file in a

virtual machine.

Virt-inspector examines a virtual machine and tries to determine the

version of the OS, the kernel version, what drivers are installed,

whether the virtual machine is fully virtualized (FV) or

para-virtualized (PV), what applications are installed and more.

Virt-list-filesystems can be used to list out the filesystems in a

virtual machine image (for shell scripts etc).

Virt-list-partitions can be used to list out the partitions in a

virtual machine image.

Virt-ls is a command line tool to list out files in a virtual machine.

Virt-rescue provides a rescue shell for making interactive,

unstructured fixes to virtual machines.

Virt-resize can resize existing virtual machine disk images.

Virt-tar is an archive, backup and upload tool for virtual machines.

Virt-win-reg lets you look inside the Windows Registry for

Windows virtual machines.

%package -n ocaml-%{name}

Summary:       OCaml bindings for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

%description -n ocaml-%{name}

ocaml-%{name} contains OCaml bindings for %{name}.

This is for toplevel and scripting access only.  To compile OCaml

programs which use %{name} you will also need ocaml-%{name}-devel.

%package -n ocaml-%{name}-devel

Summary:       OCaml bindings for %{name}

Group:         Development/Libraries

Requires:      ocaml-%{name} = %{epoch}:%{version}-%{release}

%description -n ocaml-%{name}-devel

ocaml-%{name}-devel contains development libraries

required to use the OCaml bindings for %{name}.

%package -n perl-%{name}

Summary:       Perl bindings for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# RHBZ#523547

Requires:      perl-XML-XPath

%description -n perl-%{name}

perl-%{name} contains Perl bindings for %{name}.

%package -n python-%{name}

Summary:       Python bindings for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

%description -n python-%{name}

python-%{name} contains Python bindings for %{name}.

%package -n ruby-%{name}

Summary:       Ruby bindings for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      ruby(abi) = 1.8

Provides:      ruby(guestfs) = %{version}

%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}

%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%description -n ruby-%{name}

ruby-%{name} contains Ruby bindings for %{name}.

%package java

Summary:       Java bindings for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      java >= 1.5.0

Requires:      jpackage-utils

%description java

%{name}-java contains Java bindings for %{name}.

If you want to develop software in Java which uses %{name}, then

you will also need %{name}-java-devel.

%package java-devel

Summary:       Java development package for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      %{name}-java = %{epoch}:%{version}-%{release}

%description java-devel

%{name}-java-devel contains the tools for developing Java software

using %{name}.

See also %{name}-javadoc.

%package javadoc

Summary:       Java documentation for %{name}

Group:         Development/Libraries

Requires:      %{name} = %{epoch}:%{version}-%{release}

Requires:      %{name}-java = %{epoch}:%{version}-%{release}

Requires:      jpackage-utils

%description javadoc

%{name}-javadoc contains the Java documentation for %{name}.

%prep

%setup -q

%patch0 -p1

mkdir -p daemon/m4

%build

%if %{buildnet}

%define extra --with-mirror=%{mirror} --with-repo=centos-5 --with-updates=%{updates}

%else

# Build a local repository containing the packages used to

# install the current buildroot (assuming we are being built

# with mock or Koji).  Then tell febootstrap to reference this

# local repository when building the appliance.

mkdir repo

find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 cp -t repo

createrepo repo

%define extra --with-mirror=file://$(pwd)/repo --with-repo=epel-5 --with-updates=none

%endif

./configure \

  --prefix=%{_prefix} --libdir=%{_libdir} \

  --mandir=%{_mandir} \

  --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \

  --enable-debug-command \

  --enable-supermin \

%if %{with_virtio}

  --with-drive-if=virtio \

%endif

  %{extra}

# This ensures that /usr/sbin/chroot is on the path.  Not needed

# except for RHEL 5, it shouldn't do any harm on other platforms.

export PATH=/usr/sbin:$PATH

# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir

# not the site dir.

make INSTALLDIRS=vendor %{?_smp_mflags}

# Useful for debugging appliance problems.

echo "==== files in initramfs ===="

find initramfs -type f

echo "==== hostfiles ===="

ls -l appliance/*.supermin.hostfiles

cat appliance/*.supermin.hostfiles

echo "============"

%check

# Enable debugging - very useful if a test does fail, although

# it produces masses of output in the build.log.

export LIBGUESTFS_DEBUG=1

# Uncomment one of these, depending on whether you want to

# do a very long and thorough test ('make check') or just

# a quick test to see if things generally work.

# Tracking test issues:

# BZ       archs        branch reason

# 494075   ppc, ppc64          openbios bug causes "invalid/unsupported opcode"

# 504273   ppc, ppc64          "no opcode defined"

# 505109   ppc, ppc64          "Boot failure! No secondary bootloader specified"

# 502058   i386, x86-64 F-11   need to boot with noapic (WORKAROUND ENABLED)

# 502074   i386         all   commands segfault randomly

# 503236   i386         F-12   cryptomgr_test at doublefault_fn

# 507066   all          F-12   sequence of chroot calls (FIXED)

# 513249   all          F-12   guestfwd broken in qemu (FIXED)

# 516022   all          F-12   virtio-net gives "Network is unreachable" errors

#                                 (FIXED)

# 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt

# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM (FIXED)

# 548121   all          F-13   udevsettle command is broken (WORKAROUND)

# 553689   all          F-13   missing SeaBIOS (FIXED)

# 563103   all          F-13   glibc incorrect emulation of preadv/pwritev

# 567567   32-bit       all    guestfish xstrtol test failure on 32-bit (FIXED)

# 575734   all          F-14   microsecond resolution for blkid cache

#                                 (FIXED upstream but still broken in F-14)

# 567567   32-bit       all    guestfish xstrtol test failure on 32-bit

%if %{runtests}

%ifarch x86_64

# Parted in EPEL 5 doesn't support -m (machine-friendly) option, and

# (not being very machine-friendly) doesn't make it easy to detect

# this fact.  You would see errors like this:

#

#   /sbin/parted -m -- /dev/vda unit b print

#   /sbin/parted: invalid option -- m

#   guestfsd: error: unknown signature, expected "BYT;" [...]

export SKIP_TEST_PART_GET_PARTTYPE=1

export SKIP_TEST_PART_GET_BOOTABLE=1

make check

%endif

%endif

%install

rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

# Delete the ordinary appliance, leaving just the supermin appliance.

rm $RPM_BUILD_ROOT%{_libdir}/guestfs/vmlinuz.*

mkdir keep

mv $RPM_BUILD_ROOT%{_libdir}/guestfs/initramfs.*.supermin.img keep

rm $RPM_BUILD_ROOT%{_libdir}/guestfs/initramfs.*.img

mv keep/* $RPM_BUILD_ROOT%{_libdir}/guestfs/

rmdir keep

# Delete static libraries, libtool files.

rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a

rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la

# Clean up the examples/ directory which will get installed in %doc.

# Note we can't delete the original examples/Makefile because that

# will be needed by the check section later in the RPM build.

cp -a examples ex

pushd ex

make clean

rm Makefile*

rm -rf .deps .libs

popd

# Same for ocaml/examples.

cp -a ocaml/examples ocaml/ex

pushd ocaml/ex

make clean

rm Makefile*

popd

find $RPM_BUILD_ROOT -name perllocal.pod -delete

find $RPM_BUILD_ROOT -name .packlist -delete

find $RPM_BUILD_ROOT -name '*.bs' -delete

find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete

rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.a

rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.la

if [ "$RPM_BUILD_ROOT%{python_sitearch}" != "$RPM_BUILD_ROOT%{python_sitelib}" ]; then

   mkdir -p $RPM_BUILD_ROOT%{python_sitelib}

   mv $RPM_BUILD_ROOT%{python_sitearch}/guestfs.py* \

     $RPM_BUILD_ROOT%{python_sitelib}/

fi

# Install ruby bindings by hand.

mkdir -p $RPM_BUILD_ROOT%{ruby_sitelib}

mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}

install -p -m0644 ruby/lib/guestfs.rb $RPM_BUILD_ROOT%{ruby_sitelib}

install -p -m0755 ruby/ext/guestfs/_guestfs.so $RPM_BUILD_ROOT%{ruby_sitearch}

# Remove static-linked Java bindings.

rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.a

rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.la

# 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}

%clean

rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang

%defattr(-,root,root,-)

%doc COPYING

%{_bindir}/libguestfs-supermin-helper

%{_bindir}/libguestfs-test-tool

%{_libdir}/guestfs/

%{_libdir}/libguestfs.so.*

%{_libexecdir}/libguestfs-test-tool-helper

%{_mandir}/man1/libguestfs-test-tool.1*

%files devel

%defattr(-,root,root,-)

%doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css

%doc installed-docs/*

%{_libdir}/libguestfs.so

%{_mandir}/man3/guestfs.3*

%{_mandir}/man3/libguestfs.3*

%{_includedir}/guestfs.h

%{_includedir}/guestfs-actions.h

%{_includedir}/guestfs-structs.h

%{_libdir}/pkgconfig/libguestfs.pc

%files -n guestfish

%defattr(-,root,root,-)

%doc html/guestfish.1.html html/pod.css recipes/

%{_bindir}/guestfish

%{_mandir}/man1/guestfish.1*

%files mount

%defattr(-,root,root,-)

%doc COPYING

%{_bindir}/guestmount

%{_mandir}/man1/guestmount.1*

%files tools

%defattr(-,root,root,-)

%{_bindir}/virt-cat

%{_mandir}/man1/virt-cat.1*

%{_bindir}/virt-df

%{_mandir}/man1/virt-df.1*

%{_bindir}/virt-edit

%{_mandir}/man1/virt-edit.1*

%{_bindir}/virt-inspector

%{_mandir}/man1/virt-inspector.1*

%{_bindir}/virt-list-filesystems

%{_mandir}/man1/virt-list-filesystems.1*

%{_bindir}/virt-list-partitions

%{_mandir}/man1/virt-list-partitions.1*

%{_bindir}/virt-ls

%{_mandir}/man1/virt-ls.1*

%{_bindir}/virt-rescue

%{_mandir}/man1/virt-rescue.1*

%{_bindir}/virt-resize

%{_mandir}/man1/virt-resize.1*

%{_bindir}/virt-tar

%{_mandir}/man1/virt-tar.1*

%{_bindir}/virt-win-reg

%{_mandir}/man1/virt-win-reg.1*

%files -n ocaml-%{name}

%defattr(-,root,root,-)

%doc README

%{_libdir}/ocaml/guestfs

%exclude %{_libdir}/ocaml/guestfs/*.a

%exclude %{_libdir}/ocaml/guestfs/*.cmxa

%exclude %{_libdir}/ocaml/guestfs/*.cmx

%exclude %{_libdir}/ocaml/guestfs/*.mli

%{_libdir}/ocaml/stublibs/*.so

%{_libdir}/ocaml/stublibs/*.so.owner

%files -n ocaml-%{name}-devel

%defattr(-,root,root,-)

%doc ocaml/ex

%{_libdir}/ocaml/guestfs/*.a

%{_libdir}/ocaml/guestfs/*.cmxa

%{_libdir}/ocaml/guestfs/*.cmx

%{_libdir}/ocaml/guestfs/*.mli

%files -n perl-%{name}

%defattr(-,root,root,-)

%doc perl/examples

%{perl_vendorarch}/*

%{_mandir}/man3/Sys::Guestfs.3pm*

%{_mandir}/man3/Sys::Guestfs::Lib.3pm*

%files -n python-%{name}

%defattr(-,root,root,-)

%doc README

%{python_sitearch}/*

%{python_sitelib}/*.py

%{python_sitelib}/*.pyc

%{python_sitelib}/*.pyo

%files -n ruby-%{name}

%defattr(-,root,root,-)

%doc README

%{ruby_sitelib}/guestfs.rb

%{ruby_sitearch}/_guestfs.so

%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

%files javadoc

%defattr(-,root,root,-)

%doc README

%{_datadir}/javadoc/%{name}-java-%{version}

%changelog

* Tue Apr 13 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.2.2-1.el5.3

- Disable KVM again (see rel-eng ticket 2982).

- Disable part-get-bootable test, fails with old version of parted.

* Mon Apr 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.2.2-1

- New upstream stable branch version 1.2.2.

* Wed Mar 31 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.el5.10

- BuildRequire kvm on x86 platforms.

* Wed Mar 24 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.el5.9

- Skip failing lvresize test.

* Wed Mar 24 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.el5.8

- Backport patch to use ext4 tools on RHEL 5 (RHBZ#576688).

* Wed Mar 24 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.el5.7

- Backport patch to weaken dependency on ntfs-3g.

- Fix patch2 for this old version of patch.

* Tue Mar  2 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.el5.5

- Expand %%{_rpmconfigdir} macro, which doesn't seem to expand or exist

  on EPEL 5.

* Tue Mar  2 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.el5.4

- Disable tests on i386 because of guestfish / 32 bit xstrtol test problem