From 8a0b3320e3856d799fd0bc34d419dc59e98f3eb2 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Jan 23 2015 09:33:30 +0000
Subject: Remove patches which are upstream.


---

diff --git a/0001-lua-Define-luaL_checkint-which-was-deprecated-in-lua.patch b/0001-lua-Define-luaL_checkint-which-was-deprecated-in-lua.patch
deleted file mode 100644
index d94e81d..0000000
--- a/0001-lua-Define-luaL_checkint-which-was-deprecated-in-lua.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4f3c288a1bac741fbcc9a8cd790d30618093a03e Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sun, 18 Jan 2015 07:38:58 +0000
-Subject: [PATCH] lua: Define luaL_checkint which was deprecated in lua 5.3.
-
----
- generator/lua.ml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/generator/lua.ml b/generator/lua.ml
-index c1fa6f0..f2aa8c7 100644
---- a/generator/lua.ml
-+++ b/generator/lua.ml
-@@ -54,6 +54,12 @@ let generate_lua_c () =
- #endif
- #endif
- 
-+#if LUA_VERSION_NUM >= 503
-+#ifndef luaL_checkint
-+#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))
-+#endif
-+#endif
-+
- #include <guestfs.h>
- #include \"guestfs-internal-frontend.h\"
- 
--- 
-2.2.1
-
diff --git a/0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch b/0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
deleted file mode 100644
index b2c6e3e..0000000
--- a/0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5ab3a75e1dba7cacd45ff9a094bf27c517edd117 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 17 Jan 2015 14:24:35 +0000
-Subject: [PATCH] tests/lvm: Allow test-lvm-mapping.pl to be skipped.
-
----
- tests/lvm/test-lvm-mapping.pl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/lvm/test-lvm-mapping.pl b/tests/lvm/test-lvm-mapping.pl
-index 79a5bdd..2509231 100755
---- a/tests/lvm/test-lvm-mapping.pl
-+++ b/tests/lvm/test-lvm-mapping.pl
-@@ -22,6 +22,8 @@ use warnings;
- 
- use Sys::Guestfs;
- 
-+exit 77 if $ENV{SKIP_TEST_LVM_MAPPING_PL};
-+
- my $g = Sys::Guestfs->new ();
- 
- $g->add_drive_scratch (256 * 1024 * 1024);
--- 
-2.1.0
-
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@redhat.com> - 1:1.29.22-1
+* Thu Jan 22 2015 Richard W.M. Jones <rjones@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.