[libguestfs] Remove upstream patches.

Richard W.M. Jones rjones at fedoraproject.org
Tue Mar 24 13:12:56 UTC 2015


commit 8e8b81878f4591b4b04b907adfd0a5175d39aace
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Mar 24 13:12:48 2015 +0000

    Remove upstream patches.

 0001-v2v-test-harness-Add-support-for-OVA.patch    | 99 ----------------------
 ...rness-Measure-similarity-between-images-w.patch | 60 -------------
 ...rness-Fix-boot-loop-so-it-detects-disk-in.patch | 75 ----------------
 libguestfs.spec                                    | 14 +--
 4 files changed, 4 insertions(+), 244 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index f7e5692..b5e3326 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -25,18 +25,13 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.29.31
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz
 
-# Upstream patches to add/fix the virt-v2v test harness.
-Patch1:        0001-v2v-test-harness-Measure-similarity-between-images-w.patch
-Patch2:        0002-v2v-test-harness-Fix-boot-loop-so-it-detects-disk-in.patch
-Patch3:        0001-v2v-test-harness-Add-support-for-OVA.patch
-
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -808,9 +803,7 @@ for %{name}.
 %setup -q
 
 # Apply patches, if any, here.
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+# (no patches)
 
 # For Python 3 we must build libguestfs twice.  This creates:
 #   %{name}-%{version}/
@@ -1373,8 +1366,9 @@ popd
 
 
 %changelog
-* Tue Mar 24 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.29.31-1
+* Tue Mar 24 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.29.31-2
 - New upstream version 1.29.31.
+- Remove upstream patches.
 
 * Fri Mar 20 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.29.30-5
 - More upstream patches to fix virt-v2v test harness.


More information about the scm-commits mailing list