|
|
@@ -1,7 +1,9 @@
|
|
|
-%define lvm_version 2.02.109
|
|
|
-%define device_mapper_version 1.02.88
|
|
|
+%define lvm_version 2.02.177
|
|
|
+%define device_mapper_version 1.02.146
|
|
|
%define with_cluster 0
|
|
|
|
|
|
+%define _unpackaged_files_terminate_build 1
|
|
|
+
|
|
|
# Do not reset Release to 1 unless both lvm2 and device-mapper
|
|
|
# versions are increased together.
|
|
|
|
|
|
@@ -9,14 +11,17 @@ Summary: Userland logical volume management tools
|
|
|
Summary(ja): 論理ボリューム管理ツール
|
|
|
Name: lvm2
|
|
|
Version: %{lvm_version}
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPLv2
|
|
|
Group: System Environment/Base
|
|
|
URL: http://sources.redhat.com/lvm2
|
|
|
|
|
|
Source0: LVM2.%{lvm_version}.tgz
|
|
|
Patch0: lvm2-set-default-preferred_names.patch
|
|
|
-Patch2: lvm2-remove-mpath-device-handling-from-udev-rules.patch
|
|
|
+Patch1: lvm2-lvmetad-timeout.patch
|
|
|
+# Upstream: 3f9ae846b89a
|
|
|
+Patch2: lvm2-2_02_178-lvmlockd-fix-uninitialized.patch
|
|
|
+
|
|
|
Patch10: libdevmapper-static.patch
|
|
|
|
|
|
#Patch20: lvm2-2.02.107-fix-dupliate-const.patch
|
|
|
@@ -184,9 +189,11 @@ the device-mapper event library.
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n LVM2.%{lvm_version}
|
|
|
-%patch0 -p1
|
|
|
-%patch2 -p1
|
|
|
-%patch10 -p1
|
|
|
+%patch0 -p1 -b .preferred_names
|
|
|
+%patch1 -p1 -b .lvmetad_timeout
|
|
|
+%patch2 -p1 -b .lvmlockd_uninitialized
|
|
|
+
|
|
|
+%patch10 -p1 -b .libdevmapper_static
|
|
|
|
|
|
#%patch20 -p1
|
|
|
|
|
|
@@ -278,14 +285,14 @@ fi
|
|
|
%defattr(-,root,root,-)
|
|
|
%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
|
|
|
%attr(555,root,root) %{_sbindir}/fsadm
|
|
|
-%{_sbindir}/blkdeactivate
|
|
|
%{_sbindir}/lvchange
|
|
|
%{_sbindir}/lvconvert
|
|
|
%{_sbindir}/lvcreate
|
|
|
%{_sbindir}/lvdisplay
|
|
|
%{_sbindir}/lvextend
|
|
|
%{_sbindir}/lvm
|
|
|
-%{_sbindir}/lvmchange
|
|
|
+%{_sbindir}/lvmconf
|
|
|
+%{_sbindir}/lvmconfig
|
|
|
%{_sbindir}/lvmdiskscan
|
|
|
%{_sbindir}/lvmdump
|
|
|
%{_sbindir}/lvmsadc
|
|
|
@@ -324,10 +331,12 @@ fi
|
|
|
%{_sbindir}/vgs
|
|
|
%{_sbindir}/vgscan
|
|
|
%{_sbindir}/vgsplit
|
|
|
-%{_sbindir}/lvmconf
|
|
|
%{_mandir}/man5/lvm.conf.5.gz
|
|
|
+%{_mandir}/man7/lvmcache.7.gz
|
|
|
+%{_mandir}/man7/lvmraid.7.gz
|
|
|
+%{_mandir}/man7/lvmreport.7.gz
|
|
|
+%{_mandir}/man7/lvmsystemid.7.gz
|
|
|
%{_mandir}/man7/lvmthin.7.gz
|
|
|
-%{_mandir}/man8/blkdeactivate.8.gz
|
|
|
%{_mandir}/man8/fsadm.8.gz
|
|
|
%{_mandir}/man8/lvchange.8.gz
|
|
|
%{_mandir}/man8/lvconvert.8.gz
|
|
|
@@ -335,9 +344,12 @@ fi
|
|
|
%{_mandir}/man8/lvdisplay.8.gz
|
|
|
%{_mandir}/man8/lvextend.8.gz
|
|
|
%{_mandir}/man8/lvm.8.gz
|
|
|
+%{_mandir}/man8/lvm-config.8.gz
|
|
|
%{_mandir}/man8/lvm-dumpconfig.8.gz
|
|
|
-%{_mandir}/man8/lvmchange.8.gz
|
|
|
+%{_mandir}/man8/lvm-fullreport.8.gz
|
|
|
+%{_mandir}/man8/lvm-lvpoll.8.gz
|
|
|
%{_mandir}/man8/lvmconf.8.gz
|
|
|
+%{_mandir}/man8/lvmconfig.8.gz
|
|
|
%{_mandir}/man8/lvmdiskscan.8.gz
|
|
|
%{_mandir}/man8/lvmdump.8.gz
|
|
|
%{_mandir}/man8/lvmsadc.8.gz
|
|
|
@@ -380,6 +392,7 @@ fi
|
|
|
%dir /etc/lvm
|
|
|
%ghost /etc/lvm/cache/.cache
|
|
|
%config(noreplace) /etc/lvm/lvm.conf
|
|
|
+%config(noreplace) /etc/lvm/lvmlocal.conf
|
|
|
%dir /etc/lvm/backup
|
|
|
%dir /etc/lvm/cache
|
|
|
%dir /etc/lvm/archive
|
|
|
@@ -422,8 +435,12 @@ fi
|
|
|
%files -n device-mapper
|
|
|
%defattr(-,root,root,-)
|
|
|
%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL udev/12-dm-permissions.rules
|
|
|
+%attr(755,root,root) /sbin/blkdeactivate
|
|
|
%attr(755,root,root) /sbin/dmsetup
|
|
|
+%attr(755,root,root) /sbin/dmstats
|
|
|
+%{_mandir}/man8/blkdeactivate.8.gz
|
|
|
%{_mandir}/man8/dmsetup.8.gz
|
|
|
+%{_mandir}/man8/dmstats.8.gz
|
|
|
%dir %{_udevbasedir}
|
|
|
%dir %{_udevdir}
|
|
|
%{_udevdir}/10-dm.rules
|
|
|
@@ -432,7 +449,7 @@ fi
|
|
|
|
|
|
%files -n device-mapper-devel
|
|
|
%defattr(-,root,root,-)
|
|
|
-%attr(755,root,root) /usr%{_libdir}/libdevmapper.so
|
|
|
+/usr%{_libdir}/libdevmapper.so
|
|
|
%{_includedir}/libdevmapper.h
|
|
|
/usr%{_libdir}/pkgconfig/devmapper.pc
|
|
|
|
|
|
@@ -453,11 +470,16 @@ fi
|
|
|
|
|
|
%files -n device-mapper-event-devel
|
|
|
%defattr(-,root,root,-)
|
|
|
-%attr(755,root,root) /usr%{_libdir}/libdevmapper-event.so
|
|
|
+/usr%{_libdir}/libdevmapper-event.so
|
|
|
%{_includedir}/libdevmapper-event.h
|
|
|
/usr%{_libdir}/pkgconfig/devmapper-event.pc
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.02.177-1
|
|
|
+- updated to 2.02.177
|
|
|
+- dropped Patch2: fixed in upstream.
|
|
|
+- imported Patch1 and 2 from rawhide.
|
|
|
+
|
|
|
* Mon Jul 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.02.107-1
|
|
|
- add patch20 to fix duplicate 'const' in libdevmapper.h
|
|
|
|
tomop