rpms/lvm2/F-10 lvm2-clvmd-init.patch, NONE, 1.1 lvm2.spec, 1.150, 1.151

[Alasdair Kergon]

Author: agk

Update of /cvs/pkgs/rpms/lvm2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5625

Modified Files:
	lvm2.spec 
Added Files:
	lvm2-clvmd-init.patch 
Log Message:
- Correct path for binaries in clvmd init script. (Bug 472090.)
- Include licence files in sub-packages too.


lvm2-clvmd-init.patch:

--- NEW FILE lvm2-clvmd-init.patch ---
--- LVM2.2.02.39.old/scripts/clvmd_init_rhel4	2007-03-16 17:15:36.000000000 +0000
+++ LVM2.2.02.39/scripts/clvmd_init_rhel4	2008-11-19 19:44:19.832689000 +0000
@@ -10,11 +10,11 @@
 
 . /etc/init.d/functions
 
-LVDISPLAY="/usr/sbin/lvdisplay"
-VGCHANGE="/usr/sbin/vgchange"
-VGSCAN="/usr/sbin/vgscan"
-VGDISPLAY="/usr/sbin/vgdisplay"
-VGS="/usr/sbin/vgs"
+LVDISPLAY="/sbin/lvdisplay"
+VGCHANGE="/sbin/vgchange"
+VGSCAN="/sbin/vgscan"
+VGDISPLAY="/sbin/vgdisplay"
+VGS="/sbin/vgs"
 CLVMDOPTS="-T20"
 
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/F-10/lvm2.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- lvm2.spec	7 Oct 2008 18:02:33 -0000	1.150
+++ lvm2.spec	19 Nov 2008 20:05:46 -0000	1.151
@@ -6,7 +6,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.39
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -16,6 +16,7 @@
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
 Patch1: lvm2-config.patch
+Patch2: lvm2-clvmd-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -41,6 +42,7 @@
 %setup -q -T -D -a 1 -n LVM2.%{version}
 %patch0 -p1 -b .locking
 %patch1 -p1 -b .config
+%patch2 -p1 -b .clvmd_init
 
 %build
 %define _exec_prefix /
@@ -202,6 +204,7 @@
 fi
 
 %files cluster
+%doc COPYING
 %defattr(-,root,root,-)
 %attr(755,root,root) /usr/sbin/clvmd
 %{_sbindir}/lvmconf
@@ -226,7 +229,7 @@
 
 %files -n device-mapper
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB
+%doc COPYING 
 %doc device-mapper.%{device_mapper_version}/INSTALL
 %doc device-mapper.%{device_mapper_version}/INTRO
 %doc device-mapper.%{device_mapper_version}/README
@@ -249,6 +252,7 @@
 the device-mapper libraries.
 
 %files -n device-mapper-devel
+%doc COPYING COPYING.LIB
 %defattr(-,root,root,-)
 %attr(755,root,root) /%{_lib}/libdevmapper.so
 %{_includedir}/libdevmapper.h
@@ -270,10 +274,15 @@
 %postun -n device-mapper-libs -p /sbin/ldconfig
 
 %files -n device-mapper-libs
+%doc COPYING.LIB
 %attr(755,root,root) /%{_lib}/libdevmapper.so.*
 
 
 %changelog
+* Wed Nov 19 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-7
+- Correct path for binaries in clvmd init script. (Bug 472090.)
+- Include licence files in sub-packages too.
+
 * Tue Oct 7 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-6
 - Only set exec_prefix once and configure explicit directories to work with
   new version of rpm.