packages: multipath-tools/config.patch, multipath-tools/multipath-tools.spe...

[glen]

Author: glen                         Date: Thu Dec  3 15:37:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use multipath.conf.defaults for config base
- fix conflicts on kpartx package
- rel 2

---- Files affected:
packages/multipath-tools:
   config.patch (1.2 -> 1.3) , multipath-tools.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/multipath-tools/config.patch
diff -u packages/multipath-tools/config.patch:1.2 packages/multipath-tools/config.patch:1.3
--- packages/multipath-tools/config.patch:1.2	Mon Oct 26 16:49:18 2009
+++ packages/multipath-tools/config.patch	Thu Dec  3 16:37:40 2009
@@ -1,33 +1,41 @@
---- multipath-tools-0.4.8/multipath.conf.annotated~	2009-10-26 16:56:24.000000000 +0200
-+++ multipath-tools-0.4.8/multipath.conf.annotated	2009-10-26 16:56:57.028914153 +0200
-@@ -7,7 +7,7 @@
- ## name  : defaults
- ## desc  : multipath-tools default settings
- ##
+--- multipath-tools-0.4.8/multipath.conf.defaults~	2009-10-26 17:17:11.000000000 +0200
++++ multipath-tools-0.4.8/multipath.conf.defaults	2009-10-29 14:43:54.217124402 +0200
+@@ -1,7 +1,7 @@
+ # These are the compiled in default settings.  They will be used unless you
+ # overwrite these values in your config file.
+ 
 -#defaults {
 +defaults {
- #	#
- #	# name    : udev_dir
- #	# desc    : directory where udev creates its device nodes
-@@ -163,8 +163,8 @@
- #	#           file.
- #	# values  : yes|no
- #	# default : no
--#	user_friendly_names no
+ #	udev_dir		/dev
+ #	polling_interval	5
+ #	selector		"round-robin 0"
+@@ -13,16 +13,16 @@
+ #	rr_weight		uniform
+ #	failback		manual
+ #	no_path_retry		fail
+-#	user_friendly_names	no
+-#}
 -#
-+	user_friendly_names yes
+-#blacklist {
++	user_friendly_names	yes
++}
 +
- #	#
- #	# name    : mode
- #	# scope   : multipath
-@@ -191,8 +191,8 @@
- #	# default : determined by the process
- #	gid disk
- #
++blacklist {
+ #	devnode	"^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
+ #	devnode	"^hd[a-z]"
+ #	devnode	"^dcssblk[0-9]*"
 -#}
--#	
+-#
+-#devices {
 +}
 +
- ##
- ## name    : blacklist
- ## scope   : multipath & multipathd
++devices {
+ #	device {
+ #		vendor			"APPLE*"
+ #		product			"Xserve RAID"
+@@ -571,4 +571,4 @@
+ #		path_checker		rdac
+ #		prio			rdac
+ #	}
+-#}
++}

================================================================
Index: packages/multipath-tools/multipath-tools.spec
diff -u packages/multipath-tools/multipath-tools.spec:1.67 packages/multipath-tools/multipath-tools.spec:1.68
--- packages/multipath-tools/multipath-tools.spec:1.67	Wed Dec  2 13:23:42 2009
+++ packages/multipath-tools/multipath-tools.spec	Thu Dec  3 16:37:40 2009
@@ -4,7 +4,7 @@
 %bcond_with	initrd		# build initrd version (very broken)
 #
 %define		snap	20091020
-%define		rel		1
+%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
@@ -78,10 +78,14 @@
 Summary:	Partition device manager for device-mapper devices
 Summary(pl.UTF-8):	Zarządca urządzeń partycji dla urządzeń device-mappera
 Group:		Base
+%if "%{pld_release}" == "th"
+Conflicts:	udev-core < 1:127
+%endif
 %if "%{pld_release}" == "ti"
 Conflicts:	udev-core < 1:124-3
-%else
-Conflicts:	udev-core < 1:127
+%endif
+%if "%{pld_release}" == "ac"
+Conflicts:	udev-core < 1:079-10
 %endif
 
 %description -n kpartx
@@ -140,12 +144,12 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/multipathd
-cp -a multipath.conf.annotated $RPM_BUILD_ROOT%{_sysconfdir}/multipath.conf
+cp -a multipath.conf.defaults $RPM_BUILD_ROOT%{_sysconfdir}/multipath.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/multipathd
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/multipath/bindings
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/multipath
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/multipath
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/multipath
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/multipath
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -163,6 +167,7 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHOR ChangeLog FAQ README TODO
+%doc multipath.conf.{annotated,defaults,synthetic}
 %attr(755,root,root) %{_sbindir}/multipath
 %attr(755,root,root) %{_sbindir}/multipathd
 %dir /%{_lib}/multipath
@@ -197,6 +202,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2009/12/03 15:37:40  glen
+- use multipath.conf.defaults for config base
+- fix conflicts on kpartx package
+- rel 2
+
 Revision 1.67  2009/12/02 12:23:42  glen
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/multipath-tools/config.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.67&r2=1.68&f=u