Browse Source

device-mapper-multipath: add RH patches

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3839 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
56e08ab65e
1 changed files with 40 additions and 7 deletions
  1. 40 7
      d/device-mapper-multipath/device-mapper-multipath-vl.spec

+ 40 - 7
d/device-mapper-multipath/device-mapper-multipath-vl.spec

@@ -1,18 +1,36 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 2%{?_dist_release}
-License: GPL
+Release: 3%{?_dist_release}
+License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
 Source0: multipath-tools-%{version}.tar.bz2
 Source1: multipath.conf
 
-Requires: kpartx = %{version}-%{release}
+# patch that should go upstream
+Patch1: 0001-for-upstream-add-tpg_pref-prioritizer.patch
+
+# RH patches
+Patch1007: 0007-RH-do-not-remove.patch
+Patch1008: 0008-RH-Make-build-system-RH-Fedora-friendly.patch
+Patch1009: 0009-RH-multipathd-blacklist-all-by-default.patch
+Patch1010: 0010-RH-multipath-rules-udev-changes.patch
+Patch1014: 0014-RH-add-hp_tur-checker.patch
+Patch1017: 0017-RHBZ-554592-man-page-note.patch
+Patch1018: 0018-RHBZ-554596-SUN-6540-config.patch
+Patch1019: 0019-RHBZ-554598-fix-multipath-locking.patch
+Patch1020: 0020-RHBZ-554605-fix-manual-failover.patch
+Patch1021: 0021-RHBZ-548874-add-find-multipaths-2.patch
+Patch1022: 0022-RHBZ-557845-RHEL5-style-partitions-2.patch
+Patch1023: 0023-RHBZ-557810-emc-invista-config.patch
+Patch1024: 0024-RHBZ-565933-checker-timeout-2.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
 Requires(preun): chkconfig
-Requires: device-mapper >= 1.02.02-2
+Requires: kpartx = %{version}-%{release}
+Requires: device-mapper >= 1.02.39
 BuildRequires: sysfsutils-devel, device-mapper-devel
 #BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel, ncurses-devel
@@ -42,6 +60,20 @@ kpartx manages partition creation and removal for device-mapper devices.
 
 %prep
 %setup -q -c
+%patch1 -p1
+%patch1007 -p1
+%patch1008 -p1
+%patch1009 -p1
+%patch1010 -p1
+%patch1014 -p1
+%patch1017 -p1
+%patch1018 -p1
+%patch1019 -p1
+%patch1020 -p1
+%patch1021 -p1
+%patch1022 -p1
+%patch1023 -p1
+%patch1024 -p1
 
 
 %build
@@ -95,7 +127,7 @@ fi
 %doc multipath.conf.synthetic
 %{_syssbindir}/multipath
 %{_syssbindir}/multipathd
-%config /etc/udev/rules.d/multipath.rules
+%config /lib/udev/rules.d/40-multipath.rules
 %{_mandir}/man8/multipath.8.gz
 %{_mandir}/man8/multipathd.8.gz
 %{_mandir}/man5/multipath.conf.5.gz
@@ -109,12 +141,13 @@ fi
 %files -n kpartx
 %defattr(-,root,root,-)
 %{_syssbindir}/kpartx
-/lib/udev/kpartx_id
-%config /etc/udev/rules.d/kpartx.rules
 %{_mandir}/man8/kpartx.8.gz
 
 
 %changelog
+* Wed May 11 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.4.9-3
+- import patches from RH package
+
 * Wed Apr 20 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.4.9-2
 - install multipath libraries to %%{_lib}/multipath