rpms/device-mapper-multipath/devel fedora.patch, NONE, 1.1 device-mapper-multipath.spec, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: bmarzins

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

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	fedora.patch 
Log Message:
added fedora specific patch


fedora.patch:
 kpartx/Makefile    |    2 +-
 multipath/Makefile |   12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE fedora.patch ---
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 @@
 
 glibc: prepare $(OBJS)
 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
-	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux
+	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux -lsepol
 	
 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 @@
 
 glibc: prepare $(OBJS)
 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
-	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux
+	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux -lsepol
 	$(CC) mpath_faker.c -o mpath_ctl $(CFLAGS) -static
 	
 klibc: prepare $(OBJS)
@@ -42,12 +42,10 @@
 
 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 700 -d $(DESTDIR)/var/cache/multipath/
-	install -d $(DESTDIR)/etc/dev.d/block/
-	install -m 755 multipath.dev $(DESTDIR)/etc/dev.d/block/
 	install -d $(DESTDIR)/etc/udev/rules.d
-	install -m 755 multipath.rules $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
+	install -m 755 multipath.rules.fedora $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
 	install -d $(DESTDIR)$(mandir)
 	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
 	@if [ ! -e $(DESTDIR)/etc/multipath.conf ]; then \
@@ -56,12 +54,10 @@
 	fi
 
 uninstall:
-	rm $(DESTDIR)/etc/dev.d/block/multipath.dev
 	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: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- device-mapper-multipath.spec	17 Dec 2005 03:27:44 -0000	1.17
+++ device-mapper-multipath.spec	19 Dec 2005 17:30:31 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 9.0
+Release: 9.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -62,7 +62,10 @@
 /var/cache/multipath
 
 %changelog
-* Fri Dec 16 2005 Benjamin Marzinski <bmarzins at redhat.com>
+* Mon Dec 19 2005 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.5-9.1
+- added patch for fedora changes
+
+* Fri Dec 16 2005 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.5-9.0
 - Updated to latest upstream source (t)_4_5_post52)
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>