Misc. spec file cleaning. Move plugin .so files into new subdir.

lvm2.spec

@@ -16,7 +16,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.63
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -40,8 +40,6 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: module-init-tools
 Requires(post): chkconfig
 Requires(preun): chkconfig
-Conflicts: lvm
-Obsoletes: lvm
 
 %description
 LVM2 includes all of the support for handling read/write operations on
@@ -95,6 +93,13 @@ ln -s ../..%{_libdir}/liblvm2cmd.so.2.02 $RPM_BUILD_ROOT/usr%{_libdir}/liblvm2cm
 ln -s ../..%{_libdir}/libdevmapper.so.1.02 $RPM_BUILD_ROOT/usr%{_libdir}/libdevmapper.so
 ln -s ../..%{_libdir}/libdevmapper-event.so.1.02 $RPM_BUILD_ROOT/usr%{_libdir}/libdevmapper-event.so
 ln -s ../..%{_libdir}/libdevmapper-event-lvm2.so.2.02 $RPM_BUILD_ROOT/usr%{_libdir}/libdevmapper-event-lvm2.so
+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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,7 +211,7 @@ fi
 %{_udevdir}/11-dm-lvm.rules
 %dir /etc/lvm
 %ghost /etc/lvm/cache/.cache
-%config(noreplace) /etc/lvm/lvm.conf
+%config(noreplace) %verify(not md5 sha256 mtime size) /etc/lvm/lvm.conf
 %dir /etc/lvm/backup
 %dir /etc/lvm/cache
 %dir /etc/lvm/archive
@@ -237,9 +242,10 @@ the lvm2 libraries.
 %{_includedir}/lvm2app.h
 %{_includedir}/lvm2cmd.h
 /usr%{_libdir}/pkgconfig/lvm2app.pc
+/usr%{_libdir}/libdevmapper-event-lvm2.so
 
 %package libs
-Summary: lvm2 shared libraries
+Summary: Shared libraries for lvm2
 License: LGPLv2
 Group: System Environment/Libraries
 
@@ -251,10 +257,13 @@ This package contains shared lvm2 libraries for applications.
 %postun libs -p /sbin/ldconfig
 
 %files libs
+%defattr(-,root,root,-)
 %attr(755,root,root) %{_libdir}/liblvm2app.so.*
 %attr(755,root,root) %{_libdir}/liblvm2cmd.so.*
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2.so.*
-/usr%{_libdir}/libdevmapper-event-lvm2.so
+%dir %{_libdir}/device-mapper
+%{_libdir}/device-mapper/libdevmapper-event-lvm2mirror.so
+%{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
 %{_libdir}/libdevmapper-event-lvm2mirror.so
 %{_libdir}/libdevmapper-event-lvm2snapshot.so
 
@@ -283,8 +292,6 @@ Extensions to LVM2 to support clusters.
 %post cluster
 /sbin/chkconfig --add clvmd
 
-/sbin/lvmconf --lockinglibdir %{_libdir}
-
 %preun cluster
 if [ "$1" = 0 ]; then
 	/sbin/chkconfig --del clvmd
@@ -433,7 +440,7 @@ libdevmapper-event.
 %postun -n device-mapper-event-libs -p /sbin/ldconfig
 
 %files -n device-mapper-event-libs
-%{_libdir}/libdevmapper-event.so.*
+%attr(755,root,root) %{_libdir}/libdevmapper-event.so.*
 
 %package -n device-mapper-event-devel
 Summary: Development libraries and headers for the device-mapper event daemon
@@ -450,12 +457,20 @@ the device-mapper event library.
 
 %files -n device-mapper-event-devel
 %defattr(-,root,root,-)
-%attr(755,root,root) /usr%{_libdir}/libdevmapper-event.so
+/usr%{_libdir}/libdevmapper-event.so
 %{_includedir}/libdevmapper-event.h
 /usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 
 %changelog
+* Thu Apr 15 2010 Alasdair Kergon <agk@redhat.com> - 2.02.63-2
+- Remove 'lvmconf --lockinglibdir' from cluster post: locking is now built-in.
+- Move libdevmapper-event-lvm2.so to devel package.
+- Explicitly specify libdevmapper-event.so* attributes.
+- Drop support for upgrades from very old versions that used lvm not lvm2.
+- Move libdevmapper-event plug-in libraries into new device-mapper subdirectory.
+- Don't verify lvm.conf contents when using rpm --verify.
+
 * Wed Apr 14 2010 Alasdair Kergon <agk@redhat.com> - 2.02.63-1
 - Move development links to shared objects to /usr (hard-coded temporarily).
 - Change libdevmapper deactivation to fail if device is open.
@@ -522,7 +537,7 @@ the device-mapper event library.
 - Change spec file to support excluding cluster components from the build.
 
 * Tue Feb 16 2010 Alasdair Kergon <agk@redhat.com> - 2.02.61-1
-- Add %ORIGIN support to lv{create,extend,reduce,resize} --extents.
+- Add %%ORIGIN support to lv{create,extend,reduce,resize} --extents.
 - Accept a list of LVs with 'lvconvert --merge @tag' using process_each_lv.
 - Remove false "failed to find tree node" error when activating merging origin.
 - Exit with success when lvconvert --repair --use-policies performs no action.
@@ -642,7 +657,7 @@ the device-mapper event library.
 * Thu Nov 19 2009 Alasdair Kergon <agk@redhat.com> - 2.02.55-1
 - Fix deadlock when changing mirrors due to unpaired memlock refcount changes.
 - Fix pvmove region_size overflow for very large PVs.
-- Fix lvcreate and lvresize %PVS argument always to use sensible total size.
+- Fix lvcreate and lvresize %%PVS argument always to use sensible total size.
 - Directly restrict vgchange to activating visible LVs.
 - Fix hash lookup segfault when keys compared are different lengths.
 - Flush stdout after yes/no prompt.