- up to 2.02.64 but no initrd for now

Changed files:
    lvm2-diet.patch -> 1.4
    lvm2.spec -> 1.148

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index 2dab51d3ebec877691690c2214df79960a5ca04b..ee01f5da2c0798e29753d4bb0273ead7acf8f457 100644 (file)
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -136,27 +136,28 @@
 +
  /* FIXME Unused so far */
  #undef HAVE_SYS_STATVFS_H
- 
---- LVM2.2.02.56/tools/Makefile.in~    2009-11-25 08:28:12.000000000 +0200
-+++ LVM2.2.02.56/tools/Makefile.in     2009-11-25 08:31:43.694158250 +0200
-@@ -115,17 +115,17 @@
+
+--- LVM2.2.02.65/tools/Makefile.in~    2010-05-18 13:18:54.344217166 +0200
++++ LVM2.2.02.65/tools/Makefile.in     2010-05-18 13:21:19.303172002 +0200
+@@ -122,17 +122,17 @@
  device-mapper: $(TARGETS_DM)
  
  dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
 -      $(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
 +      $(CC) $(CFLAGS) -L$(interfacedir) -L$(top_builddir)/libdm $(LDFLAGS) \
-             -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
+             -o $@ dmsetup.o -ldevmapper $(LIBS)
  
- dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
--      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
-+      $(CC) $(CFLAGS) -static -L$(interfacedir) $(LDFLAGS) \
-             -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+-      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
++      $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
+             -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
  
  all: device-mapper
  
  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
 +      $(CC) $(CFLAGS) -L$(interfacedir) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
-               $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+               $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
  
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
+

diff --git a/lvm2.spec b/lvm2.spec
index 24832f8835d5ffa7c9660d0c62fb18b95b75b9bf..a656fb97eae153806ac4b27465590dd12aea3dba 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -26,12 +26,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.58
+Version:       2.02.65
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: f90ae2225e32cd3e4d4815297930f5b3
+# Source0-md5: 1ce72f18492ffaa92e2a20b54c0b7cc6
 Source1:       %{name}-initramfs-hook
 Source2:       %{name}-initramfs-local-top
 Patch0:                %{name}-selinux.patch
@@ -290,9 +290,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/lvm/lvm.conf
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install initrd-lvm $RPM_BUILD_ROOT%{_libdir}/initrd/lvm
 install initrd-dmsetup $RPM_BUILD_ROOT%{_libdir}/initrd/dmsetup
-%endif
 
 %{?with_dietlibc:install diet-libdevmapper.a $RPM_BUILD_ROOT%{dietlibdir}/libdevmapper.a}
+%endif
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/lvm2
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/lvm2
@@ -324,6 +324,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/dmsetup
 %attr(755,root,root) /%{_lib}/libdevmapper*.so.*.*
 %attr(755,root,root) /%{_lib}/liblvm2cmd.so.*.*
+%dir %{_libdir}/device-mapper
+%attr(755,root,root) %{_libdir}/device-mapper/*.so
 %{_mandir}/man8/dmsetup.8*
 
 %files -n device-mapper-devel
@@ -338,13 +340,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libdevmapper*.a
 
+%if %{with initrd}
 %if %{with dietlibc}
 %files -n device-mapper-dietlibc
 %defattr(644,root,root,755)
 %{dietlibdir}/libdevmapper.a
 %endif
 
-%if %{with initrd}
 %files -n device-mapper-initrd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/initrd/dmsetup