rpms/dmraid/devel dmraid-1.0.0.rc9-owner.patch, NONE, 1.1 dmraid.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7807

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc9-owner.patch 
Log Message:
Fix 'make install' for non-root users


dmraid-1.0.0.rc9-owner.patch:
 include/Makefile.in |    2 +-
 lib/Makefile.in     |    5 ++---
 man/Makefile.in     |    2 +-
 tools/Makefile.in   |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE dmraid-1.0.0.rc9-owner.patch ---
--- dmraid/1.0.0.rc9/man/Makefile.in.owner	2006-01-22 16:27:20.000000000 -0500
+++ dmraid/1.0.0.rc9/man/Makefile.in	2006-01-22 16:27:45.000000000 -0500
@@ -21,7 +21,7 @@
 	for f in $(MAN8); \
 	do \
 	   $(RM) $(MAN8DIR)/$$f; \
-	   @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+	   @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \
 	done
 
 install:	install_dmraid_man
--- dmraid/1.0.0.rc9/tools/Makefile.in.owner	2006-01-22 16:27:20.000000000 -0500
+++ dmraid/1.0.0.rc9/tools/Makefile.in	2006-01-22 16:27:51.000000000 -0500
@@ -55,7 +55,7 @@
 install_dmraid_tools: $(TARGETS)
 	@echo "Installing $(TARGETS) in $(sbindir)"; \
 	mkdir -p $(sbindir); \
-	$(INSTALL) -o $(OWNER) -g $(GROUP) $(STRIP) $(TARGETS) $(sbindir)
+	$(INSTALL) $(STRIP) $(TARGETS) $(sbindir)
 
 install: install_dmraid_tools
 
--- dmraid/1.0.0.rc9/include/Makefile.in.owner	2006-01-22 16:27:20.000000000 -0500
+++ dmraid/1.0.0.rc9/include/Makefile.in	2006-01-22 16:27:57.000000000 -0500
@@ -18,7 +18,7 @@
 install_dmraid_headers: $(HEADERS)
 	@echo "Installing $(HEADERS) in $(includedir)/dmraid"
 	mkdir -p $(includedir)/dmraid
-	$(INSTALL) -o $(OWNER) -g $(GROUP) $(STRIP) $(HEADERS) $(includedir)/dmraid
+	$(INSTALL) $(STRIP) $(HEADERS) $(includedir)/dmraid
 
 install: install_dmraid_headers
 
--- dmraid/1.0.0.rc9/lib/Makefile.in.owner	2006-01-22 16:27:20.000000000 -0500
+++ dmraid/1.0.0.rc9/lib/Makefile.in	2006-01-22 16:28:23.000000000 -0500
@@ -64,12 +64,11 @@
 	do \
 		n=$$(basename $${f}) ; \
 		if [[ "$$n" =~ '.so$$' ]]; then \
-			$(INSTALL) -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) \
+			$(INSTALL) -m 555 $(STRIP) \
 				$$f $(libdir)/$${n}. at DMRAID_LIB_VERSION@; \
 			$(LN_S) -f $${n}. at DMRAID_LIB_VERSION@ $(libdir)/$${n}; \
 		else \
-			$(INSTALL) -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) \
-				$$f $(libdir)/$${n}; \
+			$(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \
 		fi \
 	done
 


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dmraid.spec	22 Jan 2006 21:18:26 -0000	1.31
+++ dmraid.spec	22 Jan 2006 21:34:11 -0000	1.32
@@ -21,6 +21,7 @@
 Patch4: dmraid-1.0.0.rc9-table.patch
 Patch5: dmraid-1.0.0.rc9-destdir.patch
 Patch6: dmraid-1.0.0.rc9-counts.patch
+Patch7: dmraid-1.0.0.rc9-owner.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
@@ -48,6 +49,7 @@
 %patch4 -p2 -b .table
 %patch5 -p2 -b .destdir
 %patch6 -p2 -b .counts
+%patch7 -p2 -b .owner
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-static_link
@@ -104,6 +106,7 @@
 %changelog
 * Sun Jan 22 2006 Peter Jones <pjones at redhat.com> 1.0.0.rc9-FC5_5
 - Add selinux build deps
+- Don't set owner during make install
 
 * Fri Dec  9 2005 Jesse Keating <jkeating at redhat.com> 1.0.0.rc9-FC5_4.1
 - rebuilt