X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2.spec;h=76fb8124aab7f224790a7d15be02367182935781;hp=be9b802d949307ae27e7c1b2cefa249de2835fce;hb=765e2390d61eeaa5f65ee8ad304d74292d57acd8;hpb=bbd6674768c17e19e3f99518d0ee8a8d26297813

diff --git a/lvm2.spec b/lvm2.spec
index be9b802..76fb812 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -28,15 +28,18 @@
 %undefine	with_lvmdbusd
 %endif
 
+%define		ver	2.03.14
+%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.05
+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:	22e4a9e66b94bbfcf81444472ed32a2d
+Source0:	https://github.com/lvmteam/lvm2/archive/v%{tgz_ver}.tar.gz
+# Source0-md5:	f71929487aa39e049797b5b7abe8d9dd
 Patch0:		%{name}-selinux.patch
 Patch1:		device-mapper-dmsetup-export.patch
 Patch2:		%{name}-tld_init.patch
@@ -44,8 +47,7 @@ Patch3:		%{name}-run-dir.patch
 Patch4:		device-mapper-dmsetup-deps-export.patch
 Patch5:		%{name}-thin.patch
 Patch6:		%{name}-no-systemd.patch
-Patch7:		bashizm.patch
-Patch8:		link.patch
+Patch7:		link.patch
 URL:		http://www.sourceware.org/lvm2/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -278,7 +280,7 @@ 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
@@ -287,7 +289,6 @@ Statyczna biblioteka devmapper zbudowana z dietlibc.
 %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.
@@ -417,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
@@ -448,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
@@ -475,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*
@@ -506,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*
@@ -585,7 +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-metad.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