From 70cf181f367fc045d2273e348142f75f79f2895a Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: May 17 2010 20:00:32 +0000
Subject: More upstream fixes


---

diff --git a/.cvsignore b/.cvsignore
index 0526d85..69cb7bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.64.tgz
+LVM2.2.02.65.tgz
diff --git a/LVM2.2.02.64.tgz.asc b/LVM2.2.02.64.tgz.asc
deleted file mode 100644
index 728855e..0000000
--- a/LVM2.2.02.64.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQBL2vVGIoGRwVZ+LBcRAnQIAKCxp+eUo5uSIUNcL43wkPoGCMHE1ACg1etx
-T+eBJz8tMZJFcXmrsLApN54=
-=Qbv1
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.65.tgz.asc b/LVM2.2.02.65.tgz.asc
new file mode 100644
index 0000000..1cc2af7
--- /dev/null
+++ b/LVM2.2.02.65.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBL8ZXiIoGRwVZ+LBcRAuk0AJ4yBPunTcBBBO3zIZG858FHw88nhACeKlW4
+ML+au8KzI2lHO6dFPvat0S4=
+=0CWt
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index 28080b9..3717982 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.47
+%define device_mapper_version 1.02.48
 %define enable_cluster 1
 
 %if %{enable_cluster}
@@ -15,7 +15,7 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.64
+Version: 2.02.65
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -82,14 +82,8 @@ install -m 0755 scripts/lvm2_monitoring_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/in
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
 # Temporary hard-coded fixes for broken 'make install'
-
-mkdir -p -m755 $RPM_BUILD_ROOT/%{_libdir}/device-mapper
-mv $RPM_BUILD_ROOT/%{_libdir}/libdevmapper-event-lvm2mirror.so $RPM_BUILD_ROOT/%{_libdir}/device-mapper/libdevmapper-event-lvm2mirror.so
-mv $RPM_BUILD_ROOT/%{_libdir}/libdevmapper-event-lvm2snapshot.so $RPM_BUILD_ROOT/%{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
-
-# Temporary symlinks
-ln -s device-mapper/libdevmapper-event-lvm2mirror.so $RPM_BUILD_ROOT/%{_libdir}
-ln -s device-mapper/libdevmapper-event-lvm2snapshot.so $RPM_BUILD_ROOT/%{_libdir}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdevmapper-event-lvm2snapshot.so.2.02
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdevmapper-event-lvm2mirror.so.2.02
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -453,6 +447,23 @@ the device-mapper event library.
 
 
 %changelog
+* Mon May 17 2010 Alasdair Kergon <agk@redhat.com> - 2.02.65-1
+- Disallow vgchange --clustered if there are active mirrors or snapshots.
+- Fix truncated total size displayed by pvscan.
+- Skip internal lvm devices in scan if ignore_suspended_devices is set.
+- Do not merge old device cache after we run full scan. (2.02.56)
+- Add new --sysinit compound option to vgchange and lvchange.
+- Fix clvmd init script never to deactivate non-clustered volume groups.
+- Drop duplicate errors for read failures and missing devices to verbose level.
+- Do not print encryption key in message debug output (cryptsetup luksResume).
+- Use -d to control level of messages sent to syslog by dmeventd.
+- Change -d to -f to run dmeventd in foreground.
+- Fix udev flags on remove in create_and_load error path.
+- Add dm_list_splice() function to join two lists together.
+- Use /bin/bash for scripts with bashisms.
+- Switch Libs.private to Requires.private in devmapper.pc and lvm2app.pc.
+- Use pkgconfig Requires.private for devmapper-event.pc.
+
 * Fri Apr 30 2010 Alasdair Kergon <agk@redhat.com> - 2.02.64-1
 - Avoid pointless initialisation when the 'version' command is run directly.
 - Fix memory leak for invalid regex pattern input.
diff --git a/sources b/sources
index d738897..3b34d0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59fc0f7f6703a8c7f12df6b7d2e509fb  LVM2.2.02.64.tgz
+1ce72f18492ffaa92e2a20b54c0b7cc6  LVM2.2.02.65.tgz
diff --git a/upstream b/upstream
index 0526d85..69cb7bd 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.64.tgz
+LVM2.2.02.65.tgz