From b831e90c3eed659037f9ca25e65546dd811b801d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 5 Feb 2010 19:16:45 +0000 Subject: [PATCH] Remove two patches, now upstream. --- libguestfs.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index b7247ca..76833a2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -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 - 1.0.83-1 +* Fri Feb 5 2010 Richard W.M. Jones - 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 - 1:1.0.82-7 - Bump and rebuild.