Author: arekm Date: Sat May 21 09:38:28 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.02.85 (TODO: lvm2-monitor needs to be PLDized)
---- Files affected:
packages/lvm2:
device-mapper-dmsetup-export.patch (1.2 -> 1.3) , lvm2.spec (1.177 -> 1.178)
---- Diffs:
================================================================
Index: packages/lvm2/device-mapper-dmsetup-export.patch
diff -u packages/lvm2/device-mapper-dmsetup-export.patch:1.2
packages/lvm2/device-mapper-dmsetup-export.patch:1.3
--- packages/lvm2/device-mapper-dmsetup-export.patch:1.2 Thu Jun 11
02:44:22 2009
+++ packages/lvm2/device-mapper-dmsetup-export.patch Sat May 21 11:38:23 2011
@@ -98,13 +98,13 @@
static int _targets(int argc __attribute((unused)), char **argv
__attribute((unused)), void *data __attribute((unused)))
{
@@ -1699,6 +1787,7 @@ static struct command _commands[] = {
- {"info", "[<device>]", 0, 1, _info},
- {"deps", "[<device>]", 0, 1, _deps},
- {"status", "[<device>] [--target <target_type>]", 0, 1, _status},
-+ {"export", "[<device>]", 0, 1, _export},
- {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, 1,
_status},
- {"wait", "<device> [<event_nr>]", 0, 2, _wait},
- {"mknodes", "[<device>]", 0, 1, _mknodes},
+ {"info", "[<device>]", 0, -1, 1, _info},
+ {"deps", "[<device>]", 0, -1, 1, _deps},
+ {"status", "[<device>] [--target <target_type>]", 0, -1, 1, _status},
++ {"export", "[<device>]", 0, -1, 1, _export},
+ {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1,
_status},
+ {"wait", "<device> [<event_nr>]", 0, 2, 0, _wait},
+ {"mknodes", "[<device>]", 0, -1, 1, _mknodes},
diff --git a/man/dmsetup.8 b/man/dmsetup.8
index 5b2ed9f..c4524aa 100644
--- a/man/dmsetup.8.in
================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.177 packages/lvm2/lvm2.spec:1.178
--- packages/lvm2/lvm2.spec:1.177 Sun Mar 6 17:53:47 2011
+++ packages/lvm2/lvm2.spec Sat May 21 11:38:23 2011
@@ -37,12 +37,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.84
-Release: 2
+Version: 2.02.85
+Release: 0.1
License: GPL v2
Group: Applications/System
Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 8b4e0897ee48f02c0dff11940e44e23b
+# Source0-md5: 91785ca438e5ce679dd3a386b183d552
Source1: %{name}-initramfs-hook
Source2: %{name}-initramfs-local-top
Patch0: %{name}-selinux.patch
@@ -297,6 +297,7 @@
--with-optimisation="%{rpmcflags}" \
--enable-readline \
--enable-fsadm \
+ --enable-applib \
--enable-cmdlib \
--enable-dmeventd \
--enable-pkgconfig \
@@ -321,7 +322,7 @@
$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/local-top}
%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
-%{__make} install \
+%{__make} install install_system_dirs install_initscripts \
DESTDIR=$RPM_BUILD_ROOT \
OWNER="" \
GROUP=""
@@ -351,6 +352,16 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+/sbin/chkconfig --add lvm2-monitor
+%service lvm2-monitor restart
+
+%postun
+if [ "$1" = "0" ]; then
+ %service lvm2-monitor stop
+ /sbin/chkconfig --del lvm2-monitor
+fi
+
%post -n device-mapper -p /sbin/ldconfig
%postun -n device-mapper -p /sbin/ldconfig
@@ -370,6 +381,9 @@
%{_mandir}/man8/vg*.8*
%attr(750,root,root) %dir %{_sysconfdir}/lvm
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
+%dir %{_sysconfdir}/lvm/cache
+%ghost %{_sysconfdir}/lvm/cache/.cache
+%attr(754,root,root) /etc/rc.d/init.d/lvm2-monitor
%files -n device-mapper
%defattr(644,root,root,755)
@@ -381,6 +395,7 @@
%attr(755,root,root) %{_sbindir}/dmeventd
%attr(755,root,root) %{_sbindir}/dmsetup
%attr(755,root,root) /%{_lib}/libdevmapper*.so.*.*
+%attr(755,root,root) /%{_lib}/liblvm2app.so.*.*
%attr(755,root,root) /%{_lib}/liblvm2cmd.so.*.*
%dir %{_libdir}/device-mapper
%attr(755,root,root) %{_libdir}/device-mapper/*.so
@@ -390,10 +405,13 @@
%files -n device-mapper-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libdevmapper*.so
+%attr(755,root,root) %{_libdir}/liblvm2app.so
%attr(755,root,root) %{_libdir}/liblvm2cmd.so
%{_includedir}/libdevmapper*.h
+%{_includedir}/lvm2app.h
%{_includedir}/lvm2cmd.h
%{_pkgconfigdir}/devmapper*.pc
+%{_pkgconfigdir}/lvm2app.pc
%files -n device-mapper-static
%defattr(644,root,root,755)
@@ -426,6 +444,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.178 2011/05/21 09:38:23 arekm
+- up to 2.02.85 (TODO: lvm2-monitor needs to be PLDized)
+
Revision 1.177 2011/03/06 16:53:47 baggins
- rel 2
- enable udev support
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/device-mapper-dmsetup-export.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.177&r2=1.178&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
