Browse Source

lvm2-2.03.16-1

Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
69d17a0790
1 changed files with 28 additions and 20 deletions
  1. 28 20
      l/lvm2/lvm2-vl.spec

+ 28 - 20
l/lvm2/lvm2-vl.spec

@@ -5,9 +5,9 @@
 Summary: Userland logical volume management tools
 Summary(ja): 論理ボリューム管理ツール
 Name: lvm2
-Version: 2.03.11
+Version: 2.03.16
 %global lvm_version %{version}
-%define device_mapper_version 1.02.175
+%define device_mapper_version 1.02.185
 # Do not reset Release to 1 unless both lvm2 and device-mapper 
 # versions are increased together.
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -19,7 +19,13 @@ Packager: daisuke
 License: GPLv2
 URL: http://sourceware.org/lvm2/
 Source0: LVM2.%{version}.tgz
-Patch0: lvm2-set-default-preferred_names.patch
+Patch1: 0001-devices-file-move-clean-up-after-command-is-run.patch
+Patch2: 0002-devices-file-fail-if-devicesfile-filename-doesn-t-ex.patch
+Patch3: 0003-filter-mpath-handle-other-wwid-types-in-blacklist.patch
+Patch4: 0004-filter-mpath-get-wwids-from-sysfs-vpd_pg83.patch
+Patch5: 0005-pvdisplay-restore-reportformat-option.patch
+Patch6: 0006-exit-with-error-when-devicesfile-name-doesn-t-exist.patch
+Patch7: 0007-make-generate.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libaio-devel
@@ -194,7 +200,13 @@ the device-mapper event library.
 
 %prep
 %setup -q -n LVM2.%{lvm_version}
-%patch0 -p1 -b .preferred_names
+%patch1 -p1 -b .backup1
+%patch2 -p1 -b .backup2
+%patch3 -p1 -b .backup3
+%patch4 -p1 -b .backup4
+%patch5 -p1 -b .backup5
+%patch6 -p1 -b .backup6
+%patch7 -p1 -b .backup7
 
 
 %build
@@ -271,12 +283,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_post blk-availability.service lvm2-monitor.service
 if [ "$1" = "1" ] ; then
     # FIXME: what to do with this? We do not want to start it in a container/chroot
     # enable and start lvm2-monitor.service on completely new installation only, not on upgrades
+    /sbin/ldconfig
     systemctl enable lvm2-monitor.service
     systemctl start lvm2-monitor.service >/dev/null 2>&1 || :
 fi
@@ -306,10 +318,6 @@ fi
 %systemd_postun_with_restart lvm2-lvmpolld.service
 %endif
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 %if %{with systemd}
 %post dbusd
 %systemd_post lvm2-lvmdbusd.service
@@ -335,13 +343,6 @@ fi
 %systemd_preun dm-event.service dm-event.socket
 %endif
 
-%post -n device-mapper-libs -p /sbin/ldconfig
-
-%postun -n device-mapper-libs -p /sbin/ldconfig
-
-%post -n device-mapper-event-libs -p /sbin/ldconfig
-
-%postun -n device-mapper-event-libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -355,6 +356,7 @@ fi
 %{_sbindir}/lvextend
 %{_sbindir}/lvm
 %{_sbindir}/lvmconfig
+%{_sbindir}/lvmdevices
 %{_sbindir}/lvmdiskscan
 %{_sbindir}/lvmdump
 %{_sbindir}/lvmsadc
@@ -363,6 +365,7 @@ fi
 %{_sbindir}/lvremove
 %{_sbindir}/lvrename
 %{_sbindir}/lvresize
+%{_sbindir}/lvm_import_vdo
 %{_sbindir}/lvs
 %{_sbindir}/lvscan
 %{_sbindir}/pvchange
@@ -385,6 +388,7 @@ fi
 %{_sbindir}/vgextend
 %{_sbindir}/vgimport
 %{_sbindir}/vgimportclone
+%{_sbindir}/vgimportdevices
 %{_sbindir}/vgmerge
 %{_sbindir}/vgmknodes
 %{_sbindir}/vgreduce
@@ -394,6 +398,7 @@ fi
 %{_sbindir}/vgscan
 %{_sbindir}/vgsplit
 %{_mandir}/man5/lvm.conf.5.gz
+%{_mandir}/man7/lvmautoactivation.7.gz
 %{_mandir}/man7/lvmcache.7.gz
 %{_mandir}/man7/lvmraid.7.gz
 %{_mandir}/man7/lvmreport.7.gz
@@ -411,7 +416,9 @@ fi
 %{_mandir}/man8/lvm-dumpconfig.8.gz
 %{_mandir}/man8/lvm-fullreport.8.gz
 %{_mandir}/man8/lvm-lvpoll.8.gz
+%{_mandir}/man8/lvm_import_vdo.8.gz
 %{_mandir}/man8/lvmconfig.8.gz
+%{_mandir}/man8/lvmdevices.8.gz
 %{_mandir}/man8/lvmdiskscan.8.gz
 %{_mandir}/man8/lvmdump.8.gz
 %{_mandir}/man8/lvmsadc.8.gz
@@ -442,6 +449,7 @@ fi
 %{_mandir}/man8/vgextend.8.gz
 %{_mandir}/man8/vgimport.8.gz
 %{_mandir}/man8/vgimportclone.8.gz
+%{_mandir}/man8/vgimportdevices.8.gz
 %{_mandir}/man8/vgmerge.8.gz
 %{_mandir}/man8/vgmknodes.8.gz
 %{_mandir}/man8/vgreduce.8.gz
@@ -451,7 +459,7 @@ fi
 %{_mandir}/man8/vgscan.8.gz
 %{_mandir}/man8/vgsplit.8.gz
 %{_udevdir}/11-dm-lvm.rules
-%{_udevdir}/69-dm-lvm-metad.rules
+%{_udevdir}/69-dm-lvm.rules
 %dir /etc/lvm
 %ghost /etc/lvm/cache/.cache
 %config(noreplace) /etc/lvm/lvm.conf
@@ -465,14 +473,11 @@ fi
 %if %{with systemd}
 %{_sbindir}/lvmpolld
 %{_mandir}/man8/lvmpolld.8*
-%{_mandir}/man8/lvm2-activation-generator.8*
 %{_tmpfilesdir}/lvm2.conf
 %{_unitdir}/blk-availability.service
 %{_unitdir}/lvm2-lvmpolld.service
 %{_unitdir}/lvm2-lvmpolld.socket
 %{_unitdir}/lvm2-monitor.service
-%{_unitdir}/lvm2-pvscan@.service
-%attr(555, -, -) /lib/systemd/system-generators/lvm2-activation-generator
 %else
 /etc/rc.d/init.d/lvm2-monitor
 %endif
@@ -559,6 +564,9 @@ fi
 /usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Sat Nov 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.03.16-1
+- new upstream release.
+
 * Thu Apr 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.03.11-1
 - new upstream release.