rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove another upstream patch.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-07-26 18:50:09 +01:00
parent a67a388e7f
commit 3eaa9fc9db
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-perl-Don-t-set-CCFLAGS.patch
View File

@ -1,23 +0,0 @@
From a1ca9ce8ff486dba84608c5904356336b555666c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 20 Jun 2011 13:06:20 +0100
Subject: [PATCH] perl: Don't set CCFLAGS.
See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
---
perl/Makefile.PL.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
index 410e076..31147aa 100644
--- a/perl/Makefile.PL.in
+++ b/perl/Makefile.PL.in
@@ -26,5 +26,4 @@ WriteMakefile (
LIBS => '-L@top_builddir@/src/.libs -lguestfs',
INC => '-I@top_builddir@/src -I@top_srcdir@/src',
TYPEMAPS => [ '@srcdir@/typemap' ],
- CCFLAGS => '@CFLAGS@',
);
--
1.7.5.2

11
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.12.1 Version: 1.12.1
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -40,10 +40,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Disable FUSE tests, not supported in Koji at the moment. # Disable FUSE tests, not supported in Koji at the moment.
Patch0: libguestfs-1.7.13-no-fuse-test.patch Patch0: libguestfs-1.7.13-no-fuse-test.patch
# Temporarily stop setting CCFLAGS in perl subdirectory.
# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
Patch1: 0001-perl-Don-t-set-CCFLAGS.patch
# Force qemu-kvm test to run with -machine accel=tcg flag. # Force qemu-kvm test to run with -machine accel=tcg flag.
Patch2: libguestfs-1.12.0-configure-force-machine-accel-tcg.patch Patch2: libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
@ -498,7 +494,6 @@ for %{name}.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch2 -p1 %patch2 -p1
mkdir -p daemon/m4 mkdir -p daemon/m4
@ -865,9 +860,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jul 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.1-1 * Tue Jul 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.1-2
- New upstream stable branch version 1.12.1. - New upstream stable branch version 1.12.1.
- Remove 4 x upstream patches. - Remove 5 x upstream patches.
* Tue Jul 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-11 * Tue Jul 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-11
- Bump and rebuild. - Bump and rebuild.