- updated to 2.02.140

[packages/lvm2.git] / lvm2.spec

diff --git a/lvm2.spec b/lvm2.spec
index ee983944e5b212178f850dfb1654df33d98f8c76..1c1283817a1d4aabf08ccd4ca878f0a5272d5698 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -39,12 +39,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.132
+Version:       2.02.140
 Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 80af5af726949bbbb2aceb15b24b7d20
+# Source0-md5: f2191c4798c8927a6d31a96010b9f568
 Source1:       clvmd.sysconfig
 Patch0:                %{name}-selinux.patch
 Patch1:                %{name}-diet.patch
@@ -54,6 +54,7 @@ Patch4:               dl-dlsym.patch
 Patch6:                %{name}-lvm_path.patch
 Patch7:                %{name}-clvmd_cmd_timeout.patch
 Patch8:                device-mapper-dmsetup-deps-export.patch
+Patch9:                %{name}-run-dir.patch
 URL:           http://www.sourceware.org/lvm2/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -321,6 +322,7 @@ potrzeby initrd.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.
@@ -465,16 +467,23 @@ cp -a libdm/libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/chkconfig --add lvm2-lvmetad
+%service lvm2-lvmetad restart
 /sbin/chkconfig --add lvm2-monitor
 %service lvm2-monitor restart
+/sbin/chkconfig --add lvm2-lvmpolld
+%service lvm2-lvmpolld restart
+# no service restart available
 /sbin/chkconfig --add blk-availability
-# no service blk-availability restart
 
-%postun
+%preun
 if [ "$1" = "0" ]; then
+       %service lvm2-lvmetad stop
+       /sbin/chkconfig --del lvm2-lvmetad
+       %service lvm2-lvmpolld stop
+       /sbin/chkconfig --del lvm2-lvmpolld
        %service lvm2-monitor stop
        /sbin/chkconfig --del lvm2-monitor
-       #no service blk-availability stop
        /sbin/chkconfig --del blk-availability
 fi
 
@@ -488,7 +497,7 @@ export NORESTART=1
 # re-exec instead
 /usr/sbin/clvmd -S 2>/dev/null || :
 
-%postun clvmd
+%preun clvmd
 if [ "$1" = "0" ]; then
        %service clvmd stop
        /sbin/chkconfig --del clvmd
@@ -534,8 +543,8 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/lvm2-lvmpolld
 %endif
 %attr(754,root,root) /etc/rc.d/init.d/lvm2-monitor
-%attr(700,root,root) %dir /run/lvm
 %attr(700,root,root) %dir /var/lock/lvm
+%attr(700,root,root) %dir /var/run/lvm
 
 %if %{with cluster}
 %files clvmd