From 48a97ca0b5d145b4baca5f4342edf245570739b6 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Tue, 5 Apr 2005 17:51:09 +0000 Subject: [PATCH] Incorporate numerous upstream fixes. Update init script to distribution standards. --- .cvsignore | 2 +- device-mapper-multipath.spec | 26 ++++++++++++++++---------- sources | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index d551b65..494df58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -multipath-tools-0.4.2.tar.bz2 +multipath-tools-0.4.4-pre8.tar.bz2 diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index e404b3b..dbe7f63 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,15 +1,16 @@ Summary: Tools to manage multipath devices using device-mapper. Name: device-mapper-multipath -Version: 0.4.2 -Release: 1.0 +Version: 0.4.4 +Release: 0.pre8.0 License: GPL Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ -Source0: multipath-tools-%{version}.tar.bz2 +Source0: multipath-tools-0.4.4-pre8.tar.bz2 Patch0: old_dev_t_long.patch Patch1: old_dev_t_int.patch Patch2: old_dev_t_short.patch Patch3: makefile.patch +Patch4: kpartx_endian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: sysfsutils-devel,device-mapper @@ -22,7 +23,7 @@ The tools are : * kpartx : Makes multipath devices partitionable. %prep -%setup -q -n multipath-tools-%{version} +%setup -q -n multipath-tools-0.4.4-pre8 %ifarch ppc64 x86_64 %patch0 -p1 @@ -37,6 +38,7 @@ The tools are : %endif %patch3 -p1 +%patch4 -p1 %build make DESTDIR=$RPM_BUILD_ROOT @@ -48,13 +50,13 @@ make install DESTDIR=$RPM_BUILD_ROOT bindir=/sbin rcdir=/etc/rc.d/init.d %clean rm -rf $RPM_BUILD_ROOT -#%post -#/sbin/chkconfig --add multipathd +%post +/sbin/chkconfig --add multipathd -#%preun -#if [ "$1" = 0 ]; then -# /sbin/chkconfig --del multipathd -#fi +%preun +if [ "$1" = 0 ]; then + /sbin/chkconfig --del multipathd +fi %files %defattr(-,root,root,-) @@ -69,5 +71,9 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHOR COPYING README* FAQ multipath.conf.* multipath/01_udev multipath/02_multipath multipath/multipath.dev %changelog +* Mon Apr 04 2005 Alasdair Kergon - 0.4.4-0.pre8.0 +- Incorporate numerous upstream fixes. +- Update init script to distribution standards. + * Tue Mar 01 2005 Alasdair Kergon - 0.4.2-1.0 - Initial import based on Christophe Varoqui's spec file. diff --git a/sources b/sources index ec15324..d79f1e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cb3354606f24279c75d71bffde365be multipath-tools-0.4.2.tar.bz2 +0720c6a47129d2fb223e63d9b9bd97fd multipath-tools-0.4.4-pre8.tar.bz2