From 77fa81c15db8fb98574855fa8c52be1cf2488682 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Wed, 14 Apr 2010 21:25:48 +0000
Subject: [PATCH] next iteration - workaround more new 'make install' bugs

---
 lvm2.spec | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/lvm2.spec b/lvm2.spec
index 2160d90..5364885 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -83,6 +83,19 @@ install scripts/cmirrord_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/cmirrord
 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/usr%{_libdir}/liblvm2app.so
+rm -f $RPM_BUILD_ROOT/usr%{_libdir}/liblvm2cmd.so
+rm -f $RPM_BUILD_ROOT/usr%{_libdir}/libdevmapper.so
+rm -f $RPM_BUILD_ROOT/usr%{_libdir}/libdevmapper-event.so
+rm -f $RPM_BUILD_ROOT/usr%{_libdir}/libdevmapper-event-lvm2.so
+ln -s ../..%{_libdir}/liblvm2app.so.2.1 $RPM_BUILD_ROOT/usr%{_libdir}/liblvm2app.so
+ln -s ../..%{_libdir}/liblvm2cmd.so.2.02 $RPM_BUILD_ROOT/usr%{_libdir}/liblvm2cmd.so
+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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -238,10 +251,10 @@ This package contains shared lvm2 libraries for applications.
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%attr(755,root,root) /usr%{_libdir}/liblvm2app.so.*
-%attr(755,root,root) /usr%{_libdir}/liblvm2cmd.so.*
+%attr(755,root,root) %{_libdir}/liblvm2app.so.*
+%attr(755,root,root) %{_libdir}/liblvm2cmd.so.*
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2.so.*
-%{_libdir}/libdevmapper-event-lvm2.so
+/usr%{_libdir}/libdevmapper-event-lvm2.so
 %{_libdir}/libdevmapper-event-lvm2mirror.so
 %{_libdir}/libdevmapper-event-lvm2snapshot.so
 
@@ -366,7 +379,7 @@ the device-mapper libraries.
 
 %files -n device-mapper-devel
 %defattr(-,root,root,-)
-%{_libdir}/libdevmapper.so
+/usr%{_libdir}/libdevmapper.so
 %{_includedir}/libdevmapper.h
 /usr%{_libdir}/pkgconfig/devmapper.pc
 
@@ -437,7 +450,7 @@ the device-mapper event library.
 
 %files -n device-mapper-event-devel
 %defattr(-,root,root,-)
-%attr(755,root,root) /%{_lib}/libdevmapper-event.so
+%attr(755,root,root) /usr%{_libdir}/libdevmapper-event.so
 %{_includedir}/libdevmapper-event.h
 /usr%{_libdir}/pkgconfig/devmapper-event.pc