From 40366a89e65661e29373641b163ae32de189d6ce Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: May 20 2010 23:07:25 +0000 Subject: Minor bug fixes; spec file and package 'Requires' cleanups. --- diff --git a/.cvsignore b/.cvsignore index 69cb7bd..7d33289 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LVM2.2.02.65.tgz +LVM2.2.02.66.tgz diff --git a/LVM2.2.02.65.tgz.asc b/LVM2.2.02.65.tgz.asc deleted file mode 100644 index 1cc2af7..0000000 --- a/LVM2.2.02.65.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (GNU/Linux) - -iD8DBQBL8ZXiIoGRwVZ+LBcRAuk0AJ4yBPunTcBBBO3zIZG858FHw88nhACeKlW4 -ML+au8KzI2lHO6dFPvat0S4= -=0CWt ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.66.tgz.asc b/LVM2.2.02.66.tgz.asc new file mode 100644 index 0000000..802785b --- /dev/null +++ b/LVM2.2.02.66.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.1 (GNU/Linux) + +iD8DBQBL9b5NIoGRwVZ+LBcRAjyQAKDdNksNC4bDc/yRNn2asKuyLdxqAQCeMBZE +vZRgq58z9HD18dSnHxAUQFQ= +=JPSs +-----END PGP SIGNATURE----- diff --git a/lvm2-set-default-preferred_names.patch b/lvm2-set-default-preferred_names.patch index 83e76db..5e1e1b6 100644 --- a/lvm2-set-default-preferred_names.patch +++ b/lvm2-set-default-preferred_names.patch @@ -1,5 +1,5 @@ ---- LVM2.2.02.58/doc/example.conf 2010-01-07 19:54:21.000000000 +0000 -+++ LVM2.2.02.58-new/doc/example.conf 2010-01-20 18:30:32.000000000 +0000 +--- LVM2.2.02.58/doc/example.conf.in 2010-01-07 19:54:21.000000000 +0000 ++++ LVM2.2.02.58-new/doc/example.conf.in 2010-01-20 18:30:32.000000000 +0000 @@ -23,10 +23,10 @@ # same block device and the tools need to display a name for device, # all the pathnames are matched against each item in the following diff --git a/lvm2.spec b/lvm2.spec index 3717982..3d7b5e4 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -15,8 +15,8 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.65 -Release: 1%{?dist} +Version: 2.02.66 +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -34,8 +34,6 @@ BuildRequires: clusterlib-devel >= %{clusterlib_version} BuildRequires: module-init-tools BuildRequires: pkgconfig BuildRequires: libudev-devel -Requires: device-mapper >= %{device_mapper_version}-%{release} -Requires: device-mapper-event >= %{device_mapper_version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: module-init-tools Requires(post): chkconfig @@ -67,23 +65,8 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/archive -install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/backup -install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/cache -install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm -install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache - -mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d -%if %{enable_cluster} -install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd -install scripts/cmirrord_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/cmirrord -%endif -install -m 0755 scripts/lvm2_monitoring_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor -install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf - -# Temporary hard-coded fixes for broken 'make install' -rm -f $RPM_BUILD_ROOT/%{_libdir}/libdevmapper-event-lvm2snapshot.so.2.02 -rm -f $RPM_BUILD_ROOT/%{_libdir}/libdevmapper-event-lvm2mirror.so.2.02 +make install_system_dirs DESTDIR=$RPM_BUILD_ROOT +make install_initscripts DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -210,7 +193,6 @@ Summary: Development libraries and headers Group: Development/Libraries License: LGPLv2 Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} Requires: device-mapper-devel >= %{device_mapper_version}-%{release} Requires: device-mapper-event-devel >= %{device_mapper_version}-%{release} Requires: pkgconfig @@ -232,6 +214,7 @@ the lvm2 libraries. Summary: Shared libraries for lvm2 License: LGPLv2 Group: System Environment/Libraries +Requires: device-mapper-event >= %{device_mapper_version}-%{release} %description libs This package contains shared lvm2 libraries for applications. @@ -302,6 +285,7 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires: corosync >= %{corosync_version} Requires: openais >= %{openais_version} +Requires: device-mapper >= %{device_mapper_version}-%{release} %description -n cmirror Daemon providing device-mapper-based mirrors in a shared-storage cluster. @@ -361,7 +345,6 @@ Release: %{release} License: LGPLv2 Group: Development/Libraries Requires: device-mapper = %{device_mapper_version}-%{release} -Requires: device-mapper-libs = %{device_mapper_version}-%{release} Requires: pkgconfig %description -n device-mapper-devel @@ -447,6 +430,14 @@ the device-mapper event library. %changelog +* Thu May 20 2010 Alasdair Kergon - 2.02.66-2 +- Simplify and fix Requires package headers. +- If unable to obtain snapshot percentage leave value blank on reports. +- Use new install_system_dirs and install_initscripts makefile targets. +- Add lvm2app functions to lookup a vgname from a pvid and pvname. +- Change internal processing of PVs in pvchange. +- Validate internal lock ordering of orphan and VG_GLOBAL locks. + * Mon May 17 2010 Alasdair Kergon - 2.02.65-1 - Disallow vgchange --clustered if there are active mirrors or snapshots. - Fix truncated total size displayed by pvscan. diff --git a/sources b/sources index 3b34d0d..3bfb7be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ce72f18492ffaa92e2a20b54c0b7cc6 LVM2.2.02.65.tgz +59766571610a4298f8bedf9f73839050 LVM2.2.02.66.tgz diff --git a/upstream b/upstream index 69cb7bd..7d33289 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.65.tgz +LVM2.2.02.66.tgz