SPECS: multipath-tools.spec - no reason to keep multipathd separat...

[glen]

Author: glen                         Date: Sun Jul 30 19:44:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no reason to keep multipathd separately in /usr/sbin
- verbose files back!
- bashism.patch looks outdated, optflags patch needs update!

---- Files affected:
SPECS:
   multipath-tools.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/multipath-tools.spec
diff -u SPECS/multipath-tools.spec:1.21 SPECS/multipath-tools.spec:1.22
--- SPECS/multipath-tools.spec:1.21	Sat Jul 29 20:20:07 2006
+++ SPECS/multipath-tools.spec	Sun Jul 30 21:44:08 2006
@@ -9,10 +9,9 @@
 Source0:	http://christophe.varoqui.free.fr/multipath-tools/%{name}-%{version}.tar.bz2
 # Source0-md5:	0a7574f0dd85f2b50f6aff91d83633ad
 URL:		http://christophe.varoqui.free.fr/
-#Patch0:		%{name}-optflags.patch
-#Patch1:		%{name}-bashism.patch
+#Patch0: %{name}-optflags.patch # NEEDS UPDATE
 Patch0:		%{name}-llh.patch
-Patch1:	%{name}-selinux.patch
+Patch1:		%{name}-selinux.patch
 Patch2:		%{name}-udev.patch
 BuildRequires:	device-mapper-devel >= 1.01.01
 BuildRequires:	linux-libc-headers >= 2.6.12.0-5
@@ -22,7 +21,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
-%define		_bindir		%{_prefix}/sbin
 
 %description
 multipath-tools provides the tools to manage multipathed devices by
@@ -61,11 +59,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_sbindir}/multipathd $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/{,40-}multipath.rules
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/block/multipath.dev
 
@@ -78,9 +74,14 @@
 %{_sysconfdir}/udev/rules.d/*.rules
 %attr(755,root,root) %{_sbindir}/devmap_name
 %attr(755,root,root) %{_sbindir}/kpartx
-%attr(755,root,root) %{_sbindir}/mpath_prio_*
+%attr(755,root,root) %{_sbindir}/mpath_prio_alua
+%attr(755,root,root) %{_sbindir}/mpath_prio_balance_units
+%attr(755,root,root) %{_sbindir}/mpath_prio_emc
+%attr(755,root,root) %{_sbindir}/mpath_prio_netapp
+%attr(755,root,root) %{_sbindir}/mpath_prio_random
+%attr(755,root,root) %{_sbindir}/mpath_prio_tpc
 %attr(755,root,root) %{_sbindir}/multipath
-%attr(755,root,root) %{_bindir}/multipathd
+%attr(755,root,root) %{_sbindir}/multipathd
 %{_mandir}/man8/devmap_name.8*
 %{_mandir}/man8/kpartx.8*
 %{_mandir}/man8/mpath_prio_alua.8*
@@ -101,6 +102,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/07/30 19:44:08  glen
+- no reason to keep multipathd separately in /usr/sbin
+- verbose files back!
+- bashism.patch looks outdated, optflags patch needs update!
+
 Revision 1.21  2006/07/29 18:20:07  aredridel
 - 0.4.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/multipath-tools.spec?r1=1.21&r2=1.22&f=u