From 78f29117d905301f4d111681902515d86e432224 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Thu, 8 Jul 2010 13:18:21 +0000
Subject: [PATCH] - New development branch 1.5.0. - Remove two upstream
 patches.

---
 .cvsignore                                    |  2 +-
 ....3.21-Explicitly-depend-on-e2fsprogs.patch | 25 -------------------
 ...rt-by-adding-required-kernel-modules.patch | 24 ------------------
 libguestfs.spec                               | 14 +++++------
 sources                                       |  2 +-
 5 files changed, 8 insertions(+), 59 deletions(-)
 delete mode 100644 libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch
 delete mode 100644 libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch

diff --git a/.cvsignore b/.cvsignore
index 21865a3..aa6330b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libguestfs-1.3.21.tar.gz
+libguestfs-1.5.0.tar.gz
diff --git a/libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch b/libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch
deleted file mode 100644
index b924cda..0000000
--- a/libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9928498ad87ed1d7a1c191d5637d36d5f9b09ee4 Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones@redhat.com>
-Date: Mon, 28 Jun 2010 13:51:42 +0100
-Subject: [PATCH 2/2] Explicitly depend on e2fsprogs.
-
-See: http://lists.fedoraproject.org/pipermail/devel/2010-June/137953.html
----
- appliance/packagelist.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 3c38978..16dc88d 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -12,6 +12,7 @@
-   augeas-libs
-   btrfs-progs
-   diffutils
-+  e2fsprogs
-   /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
-   e4fsprogs
-   gfs-utils
--- 
-1.6.6.1
-
diff --git a/libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch b/libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch
deleted file mode 100644
index f92c024..0000000
--- a/libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 61adbba900a4150110d9fcd20097b3a5c249e6c7 Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones@redhat.com>
-Date: Mon, 28 Jun 2010 09:13:36 +0100
-Subject: [PATCH 1/2] Fix gfs2 support by adding required kernel modules.
-
----
- appliance/kmod.whitelist.in |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in
-index b225f30..0a92122 100644
---- a/appliance/kmod.whitelist.in
-+++ b/appliance/kmod.whitelist.in
-@@ -65,3 +65,7 @@ crc*.ko
- libcrc*.ko
- 
- loop.ko
-+
-+gfs2.ko
-+dlm.ko
-+configfs.ko
--- 
-1.6.6.1
-
diff --git a/libguestfs.spec b/libguestfs.spec
index a7f2cd3..cbb3bb5 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -41,8 +41,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.3.21
-Release:       4%{?dist}
+Version:       1.5.0
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,10 +52,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
-# Upstream patches to fix GFS and e2fsprogs problems.
-Patch1:        libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch
-Patch2:        libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -393,8 +389,6 @@ Requires:      jpackage-utils
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -700,6 +694,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul  8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.0-1
+- New development branch 1.5.0.
+- Remove two upstream patches.
+
 * Mon Jun 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.21-4
 - Explicitly depend on e2fsprogs.
 - Add patch to add e2fsprogs to the appliance.
diff --git a/sources b/sources
index 4d11e13..b9c9199 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f53e94c5558bbc30bf2729e4495c5fb  libguestfs-1.3.21.tar.gz
+df7c18a3c06bb453680e0a7189613b55  libguestfs-1.5.0.tar.gz