packages: lvm2/lvm2-diet.patch, lvm2/lvm2.spec - up to 2.02.49

[arekm]

Author: arekm                        Date: Sun Jul 19 13:38:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.02.49

---- Files affected:
packages/lvm2:
   lvm2-diet.patch (1.1 -> 1.2) , lvm2.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: packages/lvm2/lvm2-diet.patch
diff -u packages/lvm2/lvm2-diet.patch:1.1 packages/lvm2/lvm2-diet.patch:1.2
--- packages/lvm2/lvm2-diet.patch:1.1	Wed Mar 18 14:46:02 2009
+++ packages/lvm2/lvm2-diet.patch	Sun Jul 19 15:38:45 2009
@@ -147,21 +147,29 @@
  
 --- LVM2.2.02.45/tools/Makefile.in~	2009-03-18 13:52:30.000000000 +0100
 +++ LVM2.2.02.45/tools/Makefile.in	2009-03-18 13:53:06.000000000 +0100
-@@ -106,7 +106,7 @@
+@@ -109,19 +109,19 @@
+ device-mapper: $(TARGETS_DM)
  
  dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
- 	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \
--	      -L$(top_srcdir)/libdm -L$(DESTDIR)/lib -ldevmapper $(LIBS)
-+	      -L$(interfacedir) -L$(top_srcdir)/libdm -L$(DESTDIR)/lib -ldevmapper $(LIBS)
+-	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \
+-	      -L$(top_srcdir)/libdm -ldevmapper $(LIBS)
++	$(CC) -o $@ dmsetup.o $(CFLAGS) \
++	      -L$(interfacedir) -L$(top_srcdir)/libdm $(LDFLAGS) -ldevmapper $(LIBS)
  
  dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
- 	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
-@@ -117,7 +117,7 @@
+-	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
+-	      -L$(interfacedir) -ldevmapper $(LIBS) \
++	$(CC) -o $@ dmsetup.o $(CFLAGS) -static \
++	      -L$(interfacedir) $(LDFLAGS) -ldevmapper $(LIBS) \
+ 	      $(LIB_PTHREAD)
  
- lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
+ all: device-mapper
+ 
+ lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a
  	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
 -		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
 +		-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
  
  LIB_PTHREAD = @LIB_PTHREAD@
- lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a  $(interfacedir)/libdevmapper.a
+ lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
+

================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.137 packages/lvm2/lvm2.spec:1.138
--- packages/lvm2/lvm2.spec:1.137	Thu Jun 11 02:44:22 2009
+++ packages/lvm2/lvm2.spec	Sun Jul 19 15:38:45 2009
@@ -27,12 +27,12 @@
 Summary:	The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
-Version:	2.02.45
-Release:	5
+Version:	2.02.49
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	440daa01b8f2ec4fe97b1cc621108220
+# Source0-md5:	ae49c161e7533c8e33b669c80154bd46
 Source1:	%{name}-initramfs-hook
 Source2:	%{name}-initramfs-local-top
 Patch0:		%{name}-selinux.patch
@@ -234,7 +234,9 @@
 
 %{__sed} -i -e 's#rpl_malloc#malloc#g' lib/misc/configure.h
 
-%{__make} -j1 lib LIB_SHARED= VERSIONED_SHLIB=
+%{__make} -j1 -C include
+%{__make} -j1 -C lib LIB_SHARED= VERSIONED_SHLIB=
+%{__make} -j1 -C libdm LIB_SHARED= VERSIONED_SHLIB=
 %{__make} -j1 -C tools dmsetup.static lvm.static
 mv -f tools/lvm.static initrd-lvm
 mv -f tools/dmsetup.static initrd-dmsetup
@@ -260,6 +262,7 @@
 	--with-interface=ioctl \
 	%{!?with_selinux:--disable-selinux}
 %{__make} -j1
+%{__make} -j1 -C libdm LIB_STATIC=libdevmapper.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -292,7 +295,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/lvm2
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/lvm2
 
-install libdm/ioctl/libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
+install libdm/libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -360,6 +363,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2009/07/19 13:38:45  arekm
+- up to 2.02.49
+
 Revision 1.137  2009/06/11 00:44:22  glen
 - resurrect dmsetup export from device mapper; rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2-diet.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.137&r2=1.138&f=u