[libguestfs] Remove patches which are upstream.

Richard W.M. Jones rjones at fedoraproject.org
Fri Jan 23 09:33:09 UTC 2015


commit 8a0b3320e3856d799fd0bc34d419dc59e98f3eb2
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jan 23 09:33:30 2015 +0000

    Remove patches which are upstream.

 ...luaL_checkint-which-was-deprecated-in-lua.patch |   29 --------------------
 ...m-Allow-test-lvm-mapping.pl-to-be-skipped.patch |   25 -----------------
 libguestfs.spec                                    |   13 +-------
 3 files changed, 2 insertions(+), 65 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 1716dc9..ef2685e 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -25,19 +25,13 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.29.22
-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 patch to allow LVM test to be skipped in check section.
-Patch1:        0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
-
-# Upstream patch which fixes LUA 5.3 (beta) in Rawhide.
-Patch2:        0001-lua-Define-luaL_checkint-which-was-deprecated-in-lua.patch
-
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -736,9 +730,6 @@ for %{name}.
 %prep
 %setup -q
 
-%patch1 -p1
-%patch2 -p1
-
 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     # For sVirt to work, the local temporary directory we use in the
     # tests must be labelled the same way as /tmp.
@@ -1240,7 +1231,7 @@ popd
 
 
 %changelog
-* Thu Jan 22 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.29.22-1
+* Thu Jan 22 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.29.22-2
 - New upstream version 1.29.22.
 - BR ounit (will be required for building >= 1.29.23).
 - Disable FUSE tests because of a bug in Rawhide.


More information about the scm-commits mailing list