Remove two patches, now upstream.

This commit is contained in:
Richard W.M. Jones 2010-02-05 19:16:45 +00:00
parent 5b0cc889aa
commit b831e90c3e

View File

@ -5,7 +5,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.0.83
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -15,12 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Disable FUSE tests, not supported in Koji at the moment.
Patch0: libguestfs-1.0.79-no-fuse-test.patch
# Backport RHBZ557655 test fix from upstream.
Patch1: libguestfs-1.0.82-fix-rhbz557655-regression-test.patch
# Backport fix for unreadable yum.log from upstream.
Patch2: libguestfs-1.0.82-another-unreadable-file-var-log-yum-log.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@ -340,8 +334,6 @@ Requires: jpackage-utils
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
mkdir -p daemon/m4
@ -619,7 +611,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Feb 5 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-1
* Fri Feb 5 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-2
- New upstream release 1.0.83.
- This release fixes:
Add Marathi translations (RHBZ#561671).
@ -631,6 +623,7 @@ rm -rf $RPM_BUILD_ROOT
Update Punjabi translation (RHBZ#559480) (thanks Jaswinder Singh)
- There are significant fixes to hive file handling.
- Add hivexsh and manual page.
- Remove two patches, now upstream.
* Sun Jan 31 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.82-7
- Bump and rebuild.