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

diff --git a/lvm2.spec b/lvm2.spec
index 99819e9..8b60917 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -28,23 +28,26 @@
 %undefine	with_lvmdbusd
 %endif
 
+%define		ver	2.03.15
+%define		tgz_ver	%(echo %{version} | tr . _)
+
 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
+Version:	%{ver}
 Release:	1
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
-Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	f63cc5feaadd3000138e73f7143ed370
+Source0:	https://github.com/lvmteam/lvm2/archive/v%{tgz_ver}.tar.gz
+# Source0-md5:	19f01f04ec8be31cb008292011505263
 Patch0:		%{name}-selinux.patch
 Patch1:		device-mapper-dmsetup-export.patch
 Patch2:		%{name}-tld_init.patch
-Patch3:		dl-dlsym.patch
-Patch4:		%{name}-run-dir.patch
-Patch5:		device-mapper-dmsetup-deps-export.patch
-Patch6:		%{name}-thin.patch
-Patch7:		%{name}-no-systemd.patch
+Patch3:		%{name}-run-dir.patch
+Patch4:		device-mapper-dmsetup-deps-export.patch
+Patch5:		%{name}-thin.patch
+Patch6:		%{name}-no-systemd.patch
+Patch7:		link.patch
 URL:		http://www.sourceware.org/lvm2/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -277,11 +280,12 @@ Static devmapper library built with dietlibc.
 Statyczna biblioteka devmapper zbudowana z dietlibc.
 
 %prep
-%setup -q -n LVM2.%{version}
+%setup -q -n lvm2-%{tgz_ver}
 %{?with_selinux:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -373,6 +377,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
@@ -406,7 +418,9 @@ fi
 %attr(755,root,root) %{_sbindir}/lvdisplay
 %attr(755,root,root) %{_sbindir}/lvextend
 %attr(755,root,root) %{_sbindir}/lvm
+%attr(755,root,root) %{_sbindir}/lvm_import_vdo
 %attr(755,root,root) %{_sbindir}/lvmconfig
+%attr(755,root,root) %{_sbindir}/lvmdevices
 %attr(755,root,root) %{_sbindir}/lvmdiskscan
 %attr(755,root,root) %{_sbindir}/lvmdump
 %attr(755,root,root) %{_sbindir}/lvmsadc
@@ -437,6 +451,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vgextend
 %attr(755,root,root) %{_sbindir}/vgimport
 %attr(755,root,root) %{_sbindir}/vgimportclone
+%attr(755,root,root) %{_sbindir}/vgimportdevices
 %attr(755,root,root) %{_sbindir}/vgmerge
 %attr(755,root,root) %{_sbindir}/vgmknodes
 %attr(755,root,root) %{_sbindir}/vgreduce
@@ -451,6 +466,7 @@ fi
 %{_mandir}/man7/lvmreport.7*
 %{_mandir}/man7/lvmsystemid.7*
 %{_mandir}/man7/lvmthin.7*
+%{_mandir}/man7/lvmvdo.7*
 %{_mandir}/man8/blkdeactivate.8*
 %{_mandir}/man8/fsadm.8*
 %{_mandir}/man8/lvchange.8*
@@ -463,7 +479,9 @@ fi
 %{_mandir}/man8/lvm-fullreport.8*
 %{_mandir}/man8/lvm-lvpoll.8*
 %{_mandir}/man8/lvm.8*
+%{_mandir}/man8/lvm_import_vdo.8*
 %{_mandir}/man8/lvmconfig.8*
+%{_mandir}/man8/lvmdevices.8*
 %{_mandir}/man8/lvmdiskscan.8*
 %{_mandir}/man8/lvmdump.8*
 %{_mandir}/man8/lvmsadc.8*
@@ -494,6 +512,7 @@ fi
 %{_mandir}/man8/vgextend.8*
 %{_mandir}/man8/vgimport.8*
 %{_mandir}/man8/vgimportclone.8*
+%{_mandir}/man8/vgimportdevices.8*
 %{_mandir}/man8/vgmerge.8*
 %{_mandir}/man8/vgmknodes.8*
 %{_mandir}/man8/vgreduce.8*
@@ -517,6 +536,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
@@ -572,6 +592,7 @@ fi
 /lib/udev/rules.d/10-dm.rules
 /lib/udev/rules.d/11-dm-lvm.rules
 /lib/udev/rules.d/13-dm-disk.rules
+/lib/udev/rules.d/69-dm-lvm.rules
 /lib/udev/rules.d/95-dm-notify.rules
 %attr(755,root,root) %{_sbindir}/dmeventd
 %attr(755,root,root) %{_sbindir}/dmsetup