Author: arekm Date: Tue May 18 11:34:18 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.02.64 but no initrd for now
---- Files affected: packages/lvm2: lvm2-diet.patch (1.3 -> 1.4) , lvm2.spec (1.147 -> 1.148) ---- Diffs: ================================================================ Index: packages/lvm2/lvm2-diet.patch diff -u packages/lvm2/lvm2-diet.patch:1.3 packages/lvm2/lvm2-diet.patch:1.4 --- packages/lvm2/lvm2-diet.patch:1.3 Wed Nov 25 07:34:46 2009 +++ packages/lvm2/lvm2-diet.patch Tue May 18 13:34:13 2010 @@ -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 + ================================================================ Index: packages/lvm2/lvm2.spec diff -u packages/lvm2/lvm2.spec:1.147 packages/lvm2/lvm2.spec:1.148 --- packages/lvm2/lvm2.spec:1.147 Sat Jan 16 22:56:56 2010 +++ packages/lvm2/lvm2.spec Tue May 18 13:34:13 2010 @@ -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.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 @@ -291,9 +291,9 @@ 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 @@ -325,6 +325,8 @@ %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 @@ -339,13 +341,13 @@ %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 @@ -366,6 +368,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.148 2010/05/18 11:34:13 arekm +- up to 2.02.64 but no initrd for now + Revision 1.147 2010/01/16 21:56:56 arekm - up to 2.02.58 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2-diet.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.147&r2=1.148&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
