diff --git a/0002-ruby-add-DGUESTFS_PRIVATE_FUNCTIONS-1-to-CFLAGS.patch b/0002-ruby-add-DGUESTFS_PRIVATE_FUNCTIONS-1-to-CFLAGS.patch deleted file mode 100644 index 7b27f5b..0000000 --- a/0002-ruby-add-DGUESTFS_PRIVATE_FUNCTIONS-1-to-CFLAGS.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3653dd53a449d2d34c498ac82d7cf7b5e69f554b Mon Sep 17 00:00:00 2001 -From: Olaf Hering -Date: Wed, 2 Jan 2013 19:04:17 +0100 -Subject: [PATCH 2/2] ruby: add -DGUESTFS_PRIVATE_FUNCTIONS=1 to CFLAGS - -Signed-off-by: Olaf Hering ---- - ruby/ext/guestfs/extconf.rb.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in -index 15259ea..808ff9e 100644 ---- a/ruby/ext/guestfs/extconf.rb.in -+++ b/ruby/ext/guestfs/extconf.rb.in -@@ -30,7 +30,7 @@ unless have_library("guestfs", "guestfs_create", "guestfs.h") - end - - $CFLAGS = -- "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE_FUNCTIONS=1 " << -+ "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE_FUNCTIONS=1 -DGUESTFS_PRIVATE_FUNCTIONS=1" << - "@WARN_CFLAGS@ @WERROR_CFLAGS@" - - create_header --- -1.8.0.1 - diff --git a/libguestfs.spec b/libguestfs.spec index 68cc8cd..12c4e2d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -129,7 +129,6 @@ Version: 1.20.1 Release: 0 Patch795503: 0001-daemon-copy-entire-lvm-directory.patch Patch1: 0001-ruby-Enable-C-compiler-warnings.patch -Patch2: 0002-ruby-add-DGUESTFS_PRIVATE_FUNCTIONS-1-to-CFLAGS.patch Patch5: libguestfs-1.13.14-ruby.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.gz @@ -413,7 +412,6 @@ virtual machines. %setup -q -a 789653 %patch795503 -p1 %patch1 -p1 -#patch2 -p1 %patch5 -p1 %patch1000 -p1