From 21400a8843e1e0a8d457b87206059f34dc016266 Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Aug 07 2012 21:30:40 +0000
Subject: New upstream with bug fixes and improved thin support.


---

diff --git a/.gitignore b/.gitignore
index 4108de9..e1fb330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /LVM2.2.02.94.tgz
 /LVM2.2.02.95.tgz
 /LVM2.2.02.96.tgz
+/LVM2.2.02.97.tgz
diff --git a/LVM2.2.02.96.tgz.asc b/LVM2.2.02.96.tgz.asc
deleted file mode 100644
index 8c34971..0000000
--- a/LVM2.2.02.96.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAk/SjXMACgkQIoGRwVZ+LBflPQCfYYnlsPfqDPCKn/5RgVcC5E7i
-N0YAn2RXoJv+IobEHT5WdXkgNdJ/00le
-=tmCf
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.97.tgz.asc b/LVM2.2.02.97.tgz.asc
new file mode 100644
index 0000000..c5d407e
--- /dev/null
+++ b/LVM2.2.02.97.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlAhg2QACgkQIoGRwVZ+LBev4ACfauywNUSNBliHYwYOeWxE8ioF
+GmsAoKnovFlDDkslz1vy8M9tF/o+4neH
+=PKjV
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index e8b9ec4..bac8a1b 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.75
+%define device_mapper_version 1.02.76
 
 %define enable_thin 1
 %define enable_cluster 1
@@ -51,14 +51,13 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.96
-Release: 4%{?dist}
+Version: 2.02.97
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 Patch0: lvm2-set-default-preferred_names.patch
-Patch1: lvm2-2_02_97-composite-patch-for-udev-systemd-lvmetad-upstream-changes.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -104,7 +103,6 @@ or more physical volumes and creating one or more logical volumes
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .preferred_names
-%patch1 -p1 -b .upstream
 
 %build
 %define _default_pid_dir /run
@@ -639,6 +637,35 @@ the device-mapper event library.
 %{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Tue Aug 07 2012 Alasdair Kergon <agk@redhat.com> - 2.02.97-1
+- Improve documention of allocation policies in lvm.8.
+- Increase limit for major:minor to 4095:1048575 when using -My option.
+- Add generator for lvm2 activation systemd units.
+- Add lvm_config_find_bool lvm2app fn to retrieve bool value from config tree.
+- Respect --test when using lvmetad.
+- No longer capitalise first LV attribute char for invalid snapshots.
+- Allow vgextend to add PVs to a VG that is missing PVs.
+- Recognise Micron PCIe SSDs in filter and move array out to device-types.h.
+- Fix dumpconfig <node> to print only <node> without its siblings. (2.02.89)
+- Do not issue "Failed to handle a client connection" error if lvmetad killed.
+- Support lvchange --discards and -Z with thin pools.
+- Add discard LV segment field to reports.
+- Add --discards to lvcreate --thin.
+- Set discard and external snapshot features if thin pool target is vsn 1.1+.
+- Count percentage of completeness upwards not downwards when merging snapshot.
+- Skip activation when using vg/lvchange --sysinit -a ay and lvmetad is active.
+- Fix extending RAID 4/5/6 logical volumes
+- Fix test for PV with unknown VG in process_each_pv to ignore ignored mdas.
+- Fix _alloc_parallel_area to avoid picking already-full areas for raid devices.
+- Never issue discards when LV extents are being reconfigured, not deleted.
+- Allow release_lv_segment_area to fail as functions it calls can fail.
+- Fix missing sync of filesystem when creating thin volume snapshot.
+- Allow --noflush with dmsetup status and wait (for thin target).
+- Add dm_config_write_one_node to libdevmapper.
+- Add dm_vasprintf to libdevmapper.
+- Support thin pool message release/reserve_metadata_snap in libdevmapper.
+- Support thin pool discards and external origin features in libdevmapper.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.02.96-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f53aaef..2ed2676 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4637503d792e9ee35a9b71387bcd8a93  LVM2.2.02.96.tgz
+d18bd01334309db1c422b9bf6b181057  LVM2.2.02.97.tgz
diff --git a/upstream b/upstream
index 778321c..0a89a80 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.96.tgz
+LVM2.2.02.97.tgz