rpms/lvm2/devel lvm2-static.patch,1.2,1.3 lvm2.spec,1.47,1.48

[fedora-cvs-commits at redhat.com]

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19030

Modified Files:
	lvm2.spec 
Added Files:
	lvm2-static.patch 
Log Message:
fix static build


lvm2-static.patch:
 Makefile.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: lvm2-static.patch
===================================================================
RCS file: lvm2-static.patch
diff -N lvm2-static.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lvm2-static.patch	14 Jun 2005 19:35:02 -0000	1.3
@@ -0,0 +1,12 @@
+--- LVM2.2.01.12/tools/Makefile.in	2005-06-06 18:12:07.000000000 +0100
++++ LVM2.2.01.12-new/tools/Makefile.in	2005-06-14 20:33:48.000000000 +0100
+@@ -98,7 +98,8 @@
+ 	$(CC) -o $@ $(OBJECTS) lvm.o $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
+-	$(CC) -o $@ $(OBJECTS) lvm-static.o -static $(LDFLAGS) $(LVMLIBS) \
++	$(CC) -o $@ $(OBJECTS) lvm-static.o -static \
++		--allow-multiple-definition $(LDFLAGS) $(LVMLIBS) \
+ 		$(LIBS) -rdynamic
+ 
+ liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS)


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- lvm2.spec	14 Jun 2005 18:49:11 -0000	1.47
+++ lvm2.spec	14 Jun 2005 19:35:02 -0000	1.48
@@ -6,6 +6,7 @@
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
+Patch0: lvm2-static.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: device-mapper >= 1.01
 BuildRequires: libselinux-devel
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q -n LVM2.%{version}
+%patch0 -p1
 
 %build
 %configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-pool=internal --with-staticdir=/sbin --with-user= --with-group=