X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2.spec;h=7a0c3cdf2815c6bbade51aea27ea11bff2643d35;hp=99819e97e3219edca7677dca2bd26f0f259fe857;hb=61021d7748f789691ae51aaaac78ffe832c89166;hpb=be70f157b948e32b7661a5b6e50461ad77e5ee7a

diff --git a/lvm2.spec b/lvm2.spec
index 99819e9..7a0c3cd 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -32,7 +32,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.03.00
-Release:	1
+Release:	2
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -45,6 +45,7 @@ Patch4:		%{name}-run-dir.patch
 Patch5:		device-mapper-dmsetup-deps-export.patch
 Patch6:		%{name}-thin.patch
 Patch7:		%{name}-no-systemd.patch
+Patch8:		%{name}-removed-lvmetad-fix.patch
 URL:		http://www.sourceware.org/lvm2/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -282,9 +283,11 @@ Statyczna biblioteka devmapper zbudowana z dietlibc.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.
@@ -373,6 +376,14 @@ cp -a libdm/libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- lvm2 < 2.03.00
+%service lvm2-lvmetad stop
+/sbin/chkconfig --del lvm2-lvmetad
+
+%triggerin -- lvm2-clvmd
+%service clvmd stop
+/sbin/chkconfig --del clvmd
+
 %post
 /sbin/chkconfig --add lvm2-monitor
 %service lvm2-monitor restart
@@ -517,6 +528,7 @@ fi
 %ghost %{_sysconfdir}/lvm/cache/.cache
 %attr(754,root,root) /etc/rc.d/init.d/blk-availability
 %attr(754,root,root) /etc/rc.d/init.d/lvm2-monitor
+%attr(700,root,root) %dir /var/run/lvm
 %attr(700,root,root) %dir /var/lock/lvm
 %if %{with lvmlockd}
 %attr(755,root,root) %{_sbindir}/lvmlockctl