packages: multipath-tools/multipath-tools-kpartx-udev.patch, multipath-tool...

[arekm]

Author: arekm                        Date: Tue Nov 16 20:32:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.4.9

---- Files affected:
packages/multipath-tools:
   multipath-tools-kpartx-udev.patch (1.2 -> 1.3) , multipath-tools.spec (1.68 -> 1.69) , 493400_multipathd_umask_fix.patch (1.1 -> NONE)  (REMOVED), multipath-tools-bindings.patch (1.1 -> NONE)  (REMOVED), multipath-tools-branch.diff (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/multipath-tools/multipath-tools-kpartx-udev.patch
diff -u packages/multipath-tools/multipath-tools-kpartx-udev.patch:1.2 packages/multipath-tools/multipath-tools-kpartx-udev.patch:1.3
--- packages/multipath-tools/multipath-tools-kpartx-udev.patch:1.2	Fri Oct 26 14:28:31 2007
+++ packages/multipath-tools/multipath-tools-kpartx-udev.patch	Tue Nov 16 21:32:14 2010
@@ -14,11 +14,11 @@
  
  # Create dm tables for partitions
  ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \
--        RUN+="/sbin/kpartx -a -p -part /dev/$kernel"
-+        RUN+="/sbin/kpartx -a /dev/$kernel"
+-        RUN+="/sbin/kpartx -a -p -part /dev/$name"
++        RUN+="/sbin/kpartx -a /dev/$name"
  ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \
--        RUN+="/sbin/kpartx -a -p -part /dev/$kernel"
-+        RUN+="/sbin/kpartx -a /dev/$kernel"
+-        RUN+="/sbin/kpartx -a -p -part /dev/$name"
++        RUN+="/sbin/kpartx -a /dev/$name"
  
  LABEL="kpartx_end"
  

================================================================
Index: packages/multipath-tools/multipath-tools.spec
diff -u packages/multipath-tools/multipath-tools.spec:1.68 packages/multipath-tools/multipath-tools.spec:1.69
--- packages/multipath-tools/multipath-tools.spec:1.68	Thu Dec  3 16:37:40 2009
+++ packages/multipath-tools/multipath-tools.spec	Tue Nov 16 21:32:14 2010
@@ -3,17 +3,15 @@
 # Conditional build:
 %bcond_with	initrd		# build initrd version (very broken)
 #
-%define		snap	20091020
-%define		rel		2
 Summary:	Tools to manage multipathed devices with the device-mapper
 Summary(pl.UTF-8):	Implementacja wielotrasowego dostępu do zasobów przy użyciu device-mappera
 Name:		multipath-tools
-Version:	0.4.8
-Release:	14.%{snap}.%{rel}
+Version:	0.4.9
+Release:	1
 License:	GPL v2
 Group:		Base
 Source0:	http://christophe.varoqui.free.fr/multipath-tools/%{name}-%{version}.tar.bz2
-# Source0-md5:	3563b863b408d07c46929b6e8c2c248c
+# Source0-md5:	a6d4b48afc28f1f50f5ee4b1b06d2765
 Source100:	branch.sh
 Source1:	multipathd.init
 Source2:	multipathd.sysconfig
@@ -21,11 +19,9 @@
 Source4:	%{name}-initramfs-hooks
 Source5:	%{name}-initramfs-local-top
 URL:		http://christophe.varoqui.free.fr/
-Patch100:	%{name}-branch.diff
 Patch0:		%{name}-llh.patch
 Patch1:		%{name}-kpartx-udev.patch
-Patch2:		%{name}-bindings.patch
-Patch3:		config.patch
+Patch2:		config.patch
 BuildRequires:	device-mapper-devel >= 1.02.08
 BuildRequires:	libaio-devel
 BuildRequires:	linux-libc-headers >= 2.6.12.0-5
@@ -52,6 +48,7 @@
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		skip_post_check_so	libmultipath.so.0
 %define		_sbindir	/sbin
 
 %description
@@ -112,19 +109,17 @@
 dla initramfs-tools.
 
 %prep
-%setup -q
-%patch100 -p1
+%setup -qc
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %if %{with initrd}
 %{__make} -j1 \
 	BUILD=klibc \
 	CC="klcc -static" \
-	OPTFLAGS="%{rpmcflags} -Wall -Wunused -Wstrict-prototypes" \
+	OPTFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -Wunused -Wstrict-prototypes" \
 	BUILDDIRS='multipath pathx' \
 	klibcdir=%{_libdir}/klibc \
 	libdm='$(klibcdir)/libdevmapper.a'
@@ -133,7 +128,7 @@
 %endif
 
 %{__make} -j1 \
-	OPTFLAGS="%{rpmcflags} -Wall -Wunused -Wstrict-prototypes %{?debug:-DDEBUG=1}" \
+	OPTFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -Wunused -Wstrict-prototypes %{?debug:-DDEBUG=1}" \
 	CC="%{__cc}"
 
 %install
@@ -151,6 +146,8 @@
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/multipath
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/multipath
 
+ldconfig -n -X $RPM_BUILD_ROOT%{_libdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -172,7 +169,7 @@
 %attr(755,root,root) %{_sbindir}/multipathd
 %dir /%{_lib}/multipath
 %attr(755,root,root) /%{_lib}/multipath/lib*.so
-%attr(755,root,root) /%{_lib}/libmultipath.so
+%attr(755,root,root) /%{_lib}/libmultipath.so.0
 %attr(754,root,root) /etc/rc.d/init.d/multipathd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/multipathd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/multipath.conf
@@ -202,6 +199,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2010/11/16 20:32:14  arekm
+- up to 0.4.9
+
 Revision 1.68  2009/12/03 15:37:40  glen
 - use multipath.conf.defaults for config base
 - fix conflicts on kpartx package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/multipath-tools/multipath-tools-kpartx-udev.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/multipath-tools/multipath-tools.spec?r1=1.68&r2=1.69&f=u