[libguestfs] Add two upstream patches to fix 'make check'.

Richard W.M. Jones rjones at fedoraproject.org
Thu Dec 22 22:19:08 UTC 2011


commit f35b1f468a658b9328fb0f3e894e085e85fd31dc
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Dec 22 22:18:45 2011 +0000

    Add two upstream patches to fix 'make check'.

 ...ontains-a-Perl-test-so-we-must-set-PERL5L.patch |   27 ++++++++++++++++++++
 libguestfs.spec                                    |   10 ++++---
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/0001-tests-lvm-Contains-a-Perl-test-so-we-must-set-PERL5L.patch b/0001-tests-lvm-Contains-a-Perl-test-so-we-must-set-PERL5L.patch
new file mode 100644
index 0000000..c3c29d4
--- /dev/null
+++ b/0001-tests-lvm-Contains-a-Perl-test-so-we-must-set-PERL5L.patch
@@ -0,0 +1,27 @@
+From 6067e1540fab8e8ca85e8c052bbee057882548be Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 22 Dec 2011 22:17:17 +0000
+Subject: [PATCH] tests/lvm: Contains a Perl test so we must set PERL5LIB.
+
+This fixes commit 498758faee6be7e989869bf7feba5e1026a1bb65.
+---
+ tests/lvm/Makefile.am |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/tests/lvm/Makefile.am b/tests/lvm/Makefile.am
+index 290f6b3..9c4c137 100644
+--- a/tests/lvm/Makefile.am
++++ b/tests/lvm/Makefile.am
+@@ -27,7 +27,8 @@ TESTS_ENVIRONMENT = \
+ 	MALLOC_PERTURB_=$(random_val) \
+ 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+ 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+-	TMPDIR=$(top_builddir)
++	TMPDIR=$(top_builddir) \
++	PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
+ 
+ EXTRA_DIST = \
+ 	$(TESTS)
+-- 
+1.7.6
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 793f68b..d01577f 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,15 +30,16 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.15.13
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.15-development/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# Upstream patch: tests/protocol: Contains a Perl test so we must set PERL5LIB.
+# Upstream patches:
 Patch0:        0001-tests-protocol-Contains-a-Perl-test-so-we-must-set-P.patch
+Patch1:        0001-tests-lvm-Contains-a-Perl-test-so-we-must-set-PERL5L.patch
 BuildRequires: automake
 
 %if 0%{?rhel} >= 7
@@ -593,6 +594,7 @@ for %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 automake
 
 mkdir -p daemon/m4
@@ -970,11 +972,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Dec 22 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.13-2
+* Thu Dec 22 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.13-3
 - New upstream version 1.15.13.
 - Fixes Security: Mitigate possible privilege escalation via SG_IO ioctl
   (CVE-2011-4127, RHBZ#757071).
-- Upstream patch: tests/protocol: Contains a Perl test so we must set PERL5LIB.
+- Add two upstream patches to fix 'make check'.
 
 * Thu Dec 22 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.12-1
 - New upstream version 1.15.12.


More information about the scm-commits mailing list