X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lvm2.spec;h=5cd551d736702566ac6fc1ef7a0e75f6c10639c9;hb=c931ebc2a5d62f8e4c4c1cee6db70a8d5a1231a9;hp=ee983944e5b212178f850dfb1654df33d98f8c76;hpb=7324b3759755630bc48b3db9bea3e6b4ee7df452;p=packages%2Flvm2.git

diff --git a/lvm2.spec b/lvm2.spec
index ee98394..5cd551d 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -40,7 +40,7 @@ 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
-Release:	1
+Release:	4
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -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