From 216f960a4ac7c879229d2a9583dad7b14a646701 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Jan 14 2010 14:48:18 +0000
Subject: add snapshot merge support


---

diff --git a/.cvsignore b/.cvsignore
index 4c612d8..03d5fc1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.57.tgz
+LVM2.2.02.58.tgz
diff --git a/LVM2.2.02.57.tgz.asc b/LVM2.2.02.57.tgz.asc
deleted file mode 100644
index 8eb03df..0000000
--- a/LVM2.2.02.57.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQBLTIsBIoGRwVZ+LBcRAgA2AKCwLbEFU/CQJt1yxmwiM8ZAnnEqrwCbBdc5
-ktzf9UdruVWiPaQmLug8ueA=
-=t+d5
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.58.tgz.asc b/LVM2.2.02.58.tgz.asc
new file mode 100644
index 0000000..c7829a6
--- /dev/null
+++ b/LVM2.2.02.58.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBLTyzMIoGRwVZ+LBcRAoVMAKCalmzJw2GUFd0YVtIgWIM4/kJkXwCfdEXX
+Gvz74wR3H2/VNETG96mxdGE=
+=UKuj
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index b0efaf5..5a8d8f7 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.41
+%define device_mapper_version 1.02.42
 %define corosync_version 1.0.0-1
 %define openais_version 1.1.0-1
 %define clusterlib_version 3.0.0-20
@@ -8,8 +8,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.57
-Release: 2%{?dist}
+Version: 2.02.58
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -392,7 +392,13 @@ the device-mapper event library.
 
 
 %changelog
-* Tue Nov 12 2010 Alasdair Kergon <agk@redhat.com> - 2.02.57-1
+* Thu Jan 14 2010 Alasdair Kergon <agk@redhat.com> - 2.02.58-1
+- Fix clvmd automatic target module loading crash.
+- Fix allocation code not to stop at the first area of a PV that fits.
+- Add support for the "snapshot-merge" kernel target (2.6.33-rc1).
+- Add --merge to lvconvert to merge a snapshot into its origin.
+
+* Tue Jan 12 2010 Alasdair Kergon <agk@redhat.com> - 2.02.57-1
 - Add --splitmirrors to lvconvert to split off part of a mirror.
 - Allow vgremove to remove a VG with PVs missing after a prompt.
 - Add activation/udev_rules config option in lvm.conf.
diff --git a/sources b/sources
index bb253d8..2bd5905 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27292a8a550b85f4f620d67948bbf507  LVM2.2.02.57.tgz
+f90ae2225e32cd3e4d4815297930f5b3  LVM2.2.02.58.tgz
diff --git a/upstream b/upstream
index 4c612d8..03d5fc1 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.57.tgz
+LVM2.2.02.58.tgz