OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=3

lvm-no_chown.diff

@@ -0,0 +1,183 @@
+--- daemons/clvmd/Makefile.in
++++ daemons/clvmd/Makefile.in
+@@ -76,7 +76,7 @@
+ .PHONY: install_clvmd
+ 
+ install_clvmd: $(TARGETS)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \
++	$(INSTALL) -D -m 555 $(STRIP) clvmd \
+ 		$(sbindir)/clvmd
+ 
+ install: $(INSTALL_TARGETS)
+--- dmeventd/mirror/Makefile.in
++++ dmeventd/mirror/Makefile.in
+@@ -30,7 +30,7 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D -m 555 $(STRIP) $< \
+ 		$(libdir)/$<.$(LIB_VERSION)
+ 	$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+ 
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -23,7 +23,7 @@
+ install:
+ 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
+ 		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
+-		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
++		@INSTALL@ -D -m 644 $(CONFSRC) \
+ 			$(confdir)/$(CONFDEST); \
+ 	fi
+ 
+--- lib/format1/Makefile.in
++++ lib/format1/Makefile.in
+@@ -30,7 +30,7 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: liblvm2format1.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D -m 555 $(STRIP) $< \
+ 		$(libdir)/liblvm2format1.so.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so
+ 
+--- lib/format_pool/Makefile.in
++++ lib/format_pool/Makefile.in
+@@ -27,7 +27,7 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: liblvm2formatpool.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D -m 555 $(STRIP) $< \
+ 		$(libdir)/liblvm2formatpool.so.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2formatpool.so.$(LIB_VERSION) \
+ 		$(libdir)/liblvm2formatpool.so
+--- lib/locking/Makefile.in
++++ lib/locking/Makefile.in
+@@ -23,7 +23,7 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install install_cluster: liblvm2clusterlock.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D -m 555 $(STRIP) $< \
+ 		$(libdir)/liblvm2clusterlock.so.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \
+ 		$(libdir)/liblvm2clusterlock.so
+--- lib/mirror/Makefile.in
++++ lib/mirror/Makefile.in
+@@ -23,7 +23,7 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: liblvm2mirror.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D -m 555 $(STRIP) $< \
+ 		$(libdir)/liblvm2mirror.so.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2mirror.so.$(LIB_VERSION) $(libdir)/liblvm2mirror.so
+ 
+--- lib/snapshot/Makefile.in
++++ lib/snapshot/Makefile.in
+@@ -23,7 +23,7 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: liblvm2snapshot.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D -m 555 $(STRIP) $< \
+ 		$(libdir)/liblvm2snapshot.so.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2snapshot.so.$(LIB_VERSION) \
+ 		$(libdir)/liblvm2snapshot.so
+--- man/Makefile.in
++++ man/Makefile.in
+@@ -40,14 +40,14 @@
+ 	@for f in $(MAN8); \
+ 	do \
+ 	   $(RM) $(MAN8DIR)/$$f; \
+-	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
++	   @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \
+ 	done
+ 
+ 	@echo "Installing $(MAN5) in $(MAN5DIR)"
+ 	@for f in $(MAN5); \
+ 	do \
+ 	   $(RM) $(MAN5DIR)/$$f; \
+-	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
++	   @INSTALL@ -D -m 444 $$f $(MAN5DIR)/$$f; \
+ 	done
+ 
+ install_cluster:
+@@ -55,5 +55,5 @@
+ 	@for f in $(MAN8CLUSTER); \
+ 	do \
+ 	   $(RM) $(MAN8DIR)/$$f; \
+-	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
++	   @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \
+ 	done
+--- po/Makefile.in
++++ po/Makefile.in
+@@ -25,7 +25,7 @@
+ 	@echo Installing translation files in $(localedir)
+ 	@( \
+ 		for lang in $(LANGS); do \
+-			$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
++			$(INSTALL) -D -m 444 $$lang.mo \
+ 			    $(localedir)/$$lang/LC_MESSAGES/@INTL_PACKAGE@.mo;\
+ 	  done; \
+ 	)
+--- scripts/Makefile.in
++++ scripts/Makefile.in
+@@ -18,6 +18,6 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \
++	$(INSTALL) -D -m 555 $(STRIP) lvm_dump.sh \
+ 		$(sbindir)/lvmdump
+ 
+--- tools/Makefile.in
++++ tools/Makefile.in
+@@ -142,21 +142,21 @@
+ endif
+ 
+ install_cmdlib_dynamic: liblvm2cmd.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \
++	$(INSTALL) -D -m 555 $(STRIP) liblvm2cmd.so \
+ 		$(libdir)/liblvm2cmd.so.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
++	$(INSTALL) -D -m 444 lvm2cmd.h \
+ 		$(includedir)/lvm2cmd.h
+ 
+ install_cmdlib_static: liblvm2cmd-static.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++	$(INSTALL) -D -m 555 $(STRIP) liblvm2cmd-static.a \
+ 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
+ 	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
++	$(INSTALL) -D -m 444 lvm2cmd.h \
+ 		$(includedir)/lvm2cmd.h
+ 
+ install_tools_dynamic: lvm .commands
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
++	$(INSTALL) -D -m 555 $(STRIP) lvm \
+ 		$(sbindir)/lvm
+ 	@echo Creating symbolic links for individual commands in $(sbindir)
+ 	@( \
+@@ -167,7 +167,7 @@
+ 	)
+ 
+ install_tools_static: lvm.static
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++	$(INSTALL) -D -m 555 $(STRIP) lvm.static \
+ 		$(staticdir)/lvm.static
+ 
+ install: $(INSTALL_TARGETS)
+--- tools/fsadm/Makefile.in
++++ tools/fsadm/Makefile.in
+@@ -26,6 +26,6 @@
+ 	$(CC) -o $@ $(OBJECTS) -rdynamic
+ 
+ install: fsadm
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm \
++	$(INSTALL) -D -m 555 $(STRIP) fsadm \
+ 		$(sbindir)/fsadm
+ 

lvm2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 11 18:49:50 CET 2007 - ro@suse.de
+
+- fix build as non-root and use DESTDIR
+
 -------------------------------------------------------------------
 Mon Jan  8 16:15:23 CET 2007  - fehr@suse.de
 

lvm2.spec

@@ -21,7 +21,7 @@ PreReq:         %fillup_prereq %insserv_prereq
 %endif
 Autoreqprov:    on
 Version:        2.02.17
-Release:        5
+Release:        9
 Summary:        LVM2 Tools
 Source:         LVM2.%{version}.tar.bz2
 Source1:        lvm.conf
@@ -34,6 +34,7 @@ Patch3:         no_buildroot_shared.diff
 Patch4:         sys_mount_instead_linux_fs.diff
 Patch5:         pvscan_2TB_limit.diff
 Patch9:         fix_striped_old_format.diff
+Patch10:        lvm-no_chown.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,16 +52,18 @@ Volume Manager.
 %patch4
 %patch5
 %patch9
+%patch10
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=$RPM_BUILD_ROOT --mandir=$RPM_BUILD_ROOT/usr/share/man \
+./configure --prefix=/ \
-            --includedir=$RPM_BUILD_ROOT/usr/include \
+	--mandir=%{_mandir} \
-	    --libdir=$RPM_BUILD_ROOT/%_lib
+	--includedir=/usr/include \
+	--libdir=/%_lib
 make
 
 %install
-make install
+make install DESTDIR=$RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/archive
@@ -73,7 +76,7 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
 
 %clean
-[ "$RPM_BUILD_ROOT" != / ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -rf $RPM_BUILD_ROOT
 
 %post
 %{fillup_and_insserv -n lvm -py boot.lvm}
@@ -82,6 +85,7 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
 %{insserv_cleanup}
 
 %files
+%defattr(-,root,root)
 %doc INSTALL COPYING COPYING.LIB README WHATS_NEW doc/*
 %dir /etc/lvm
 %dir /etc/lvm/backup
@@ -178,6 +182,8 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
 %{_mandir}/man8/vgsplit.8.gz
 
 %changelog -n lvm2
+* Sun Feb 11 2007 - ro@suse.de
+- fix build as non-root and use DESTDIR
 * Mon Jan 08 2007 - fehr@suse.de
 - fix buggy pointer arithmetic (#232117)
 * Mon Dec 18 2006 - fehr@suse.de