rpms/device-mapper-multipath/devel .cvsignore, 1.7, 1.8 device-mapper-multipath.spec, 1.24, 1.25 fedora.patch, 1.1, 1.2 sources, 1.8, 1.9 cache_open_mode.patch, 1.1, NONE init.patch, 1.1, NONE makefile.patch, 1.3, NONE move_cache_file.patch, 1.2, NONE old_dev_t_int.patch, 1.3, NONE old_dev_t_long.patch, 1.3, NONE old_dev_t_short.patch, 1.3, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon May 22 15:10:48 UTC 2006 

Author: agk

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21251

Modified Files:
	.cvsignore device-mapper-multipath.spec fedora.patch sources 
Removed Files:
	cache_open_mode.patch init.patch makefile.patch 
	move_cache_file.patch old_dev_t_int.patch old_dev_t_long.patch 
	old_dev_t_short.patch 
Log Message:
Newer upstream source (t0_4_5_post59).
Remove out-dated patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Feb 2006 00:40:15 -0000	1.7
+++ .cvsignore	22 May 2006 15:10:25 -0000	1.8
@@ -1,3 +1 @@
-multipath-tools-0.4.4.2.tar.bz2
-multipath-tools-0.4.5.52.tgz
-multipath-tools-0.4.5.56.tgz
+multipath-tools-0.4.5.59.tgz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- device-mapper-multipath.spec	22 May 2006 14:34:16 -0000	1.24
+++ device-mapper-multipath.spec	22 May 2006 15:10:25 -0000	1.25
@@ -1,11 +1,11 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 12.3
+Release: 16.0
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-0.4.5.56.tgz
+Source0: multipath-tools-0.4.5.59.tgz
 Patch0: fedora.patch
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -20,9 +20,10 @@
 The tools are :
 * multipath :   Scan the system for multipath devices and assemble them.
 * multipathd :  Detects when paths fail and execs multipath to update things.
+* kpartx :      Makes multipath devices partitionable.
 
 %prep
-%setup -q -n multipath-tools-0.4.5.56
+%setup -q -n multipath-tools-0.4.5.59
 
 %patch0 -p1
 
@@ -46,14 +47,18 @@
 
 %files
 %defattr(-,root,root,-)
-/sbin/kpartx
-/sbin/kpartx.static
 /sbin/multipath
 /sbin/multipath.static
+/sbin/mpath_ctl
+/sbin/kpartx
+/sbin/kpartx.static
 /sbin/multipathd
 /sbin/mpath_prio_alua
 /sbin/mpath_prio_emc
 /sbin/mpath_prio_netapp
+/sbin/mpath_prio_hds_modular
+/sbin/mpath_get_name
+/sbin/kpartx_get_name
 /etc/udev/rules.d/40-multipath.rules
 %{_mandir}/man8/mpath_prio_alua.8.gz
 %{_mandir}/man8/kpartx.8.gz
@@ -61,10 +66,13 @@
 %{_mandir}/man8/multipathd.8.gz
 %config /etc/rc.d/init.d/multipathd
 %config(noreplace) /etc/multipath.conf
-%doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
+%doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic multipath/multipath.dev
 /var/cache/multipath
 
 %changelog
+* Mon May 22 2006 Alasdair Kergon <agk at redhat.com> - 0.4.5-16.0
+- Newer upstream source (t0_4_5_post59).
+
 * Mon May 22 2006 Alasdair Kergon <agk at redhat.com> - 0.4.5-12.3
 - BuildRequires: libsepol-devel, readline-devel
 

fedora.patch:
 kpartx/Makefile    |    2 +-
 multipath/Makefile |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora.patch	19 Dec 2005 17:30:32 -0000	1.1
+++ fedora.patch	22 May 2006 15:10:25 -0000	1.2
@@ -1,7 +1,6 @@
-diff -urN multipath-tools/kpartx/Makefile multipath-tools-patched/kpartx/Makefile
---- multipath-tools/kpartx/Makefile	2005-07-20 18:34:53.000000000 -0500
-+++ multipath-tools-patched/kpartx/Makefile	2005-12-16 10:31:49.000000000 -0600
-@@ -27,7 +27,7 @@
+--- multipath-tools-0.4.5.59-old/kpartx/Makefile	2005-12-16 22:47:21.000000000 +0000
++++ multipath-tools-0.4.5.59/kpartx/Makefile	2006-05-22 16:02:12.000000000 +0100
+@@ -27,7 +27,7 @@ prepare:
  
  glibc: prepare $(OBJS)
  	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
@@ -10,10 +9,9 @@
  	
  klibc: prepare $(OBJS)
  	$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
-diff -urN multipath-tools/multipath/Makefile multipath-tools-patched/multipath/Makefile
---- multipath-tools/multipath/Makefile	2005-10-13 18:53:09.000000000 -0500
-+++ multipath-tools-patched/multipath/Makefile	2005-12-16 20:32:17.000000000 -0600
-@@ -26,7 +26,7 @@
+--- multipath-tools-0.4.5.59-old/multipath/Makefile	2006-05-12 23:17:13.000000000 +0100
++++ multipath-tools-0.4.5.59/multipath/Makefile	2006-05-22 16:03:34.000000000 +0100
+@@ -26,7 +26,7 @@ prepare:
  
  glibc: prepare $(OBJS)
  	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
@@ -22,12 +20,9 @@
  	$(CC) mpath_faker.c -o mpath_ctl $(CFLAGS) -static
  	
  klibc: prepare $(OBJS)
-@@ -42,12 +42,10 @@
- 
- install:
+@@ -44,10 +44,8 @@ install:
  	install -d $(DESTDIR)$(bindir)
--	install -m 755 $(EXEC) $(EXEC).static mpath_ctl $(DESTDIR)$(bindir)/
-+	install -m 755 $(EXEC) $(EXEC).static $(DESTDIR)$(bindir)/
+ 	install -m 755 $(EXEC) $(EXEC).static mpath_ctl mpath_get_name kpartx_get_name $(DESTDIR)$(bindir)/
  	install -m 700 -d $(DESTDIR)/var/cache/multipath/
 -	install -d $(DESTDIR)/etc/dev.d/block/
 -	install -m 755 multipath.dev $(DESTDIR)/etc/dev.d/block/
@@ -37,7 +32,7 @@
  	install -d $(DESTDIR)$(mandir)
  	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
  	@if [ ! -e $(DESTDIR)/etc/multipath.conf ]; then \
-@@ -56,12 +54,10 @@
+@@ -56,7 +54,6 @@ install:
  	fi
  
  uninstall:
@@ -45,9 +40,3 @@
  	rm $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
  	rm $(DESTDIR)$(bindir)/$(EXEC)
  	rm $(DESTDIR)$(bindir)/$(EXEC).static
--	rm $(DESTDIR)$(bindir)/mpath_ctl
- 	rm $(DESTDIR)$(mandir)/$(EXEC).8
- 
- clean:
--	rm -f core *.o $(EXEC) $(EXEC).static mpath_ctl *.gz
-+	rm -f core *.o $(EXEC) $(EXEC).static *.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Feb 2006 00:40:15 -0000	1.8
+++ sources	22 May 2006 15:10:25 -0000	1.9
@@ -1 +1 @@
-f724ea004e6a7d37e6e523d43f7c556f  multipath-tools-0.4.5.56.tgz
+53a4d885c739fdda7a06c5dba70bd43e  multipath-tools-0.4.5.59.tgz


--- cache_open_mode.patch DELETED ---


--- init.patch DELETED ---


--- makefile.patch DELETED ---


--- move_cache_file.patch DELETED ---


--- old_dev_t_int.patch DELETED ---


--- old_dev_t_long.patch DELETED ---


--- old_dev_t_short.patch DELETED ---

More information about the fedora-cvs-commits mailing list