diff --git a/.gitignore b/.gitignore index 29a08f4..01a3c36 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/vdo-9aae29d.tar.gz +SOURCES/vdo-c658747.tar.gz diff --git a/.vdo.metadata b/.vdo.metadata index 8024729..a8d6a00 100644 --- a/.vdo.metadata +++ b/.vdo.metadata @@ -1 +1 @@ -d3be59bb49ffea49fcedc9427cc41828e30d3629 SOURCES/vdo-9aae29d.tar.gz +554e49ae907caf589ff90f14952ec6dd38bc7f86 SOURCES/vdo-c658747.tar.gz diff --git a/SPECS/vdo.spec b/SPECS/vdo.spec index f05fd97..9d0797a 100644 --- a/SPECS/vdo.spec +++ b/SPECS/vdo.spec @@ -1,5 +1,5 @@ -%global commit 9aae29dfbd83d41bb3271fbe858a1f7ac9068e2f -%global gittag 6.2.5.65 +%global commit c658747fb8964e3a46c934e1e382de0abd5bb901 +%global gittag 6.2.5.74 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define spec_release 14 @@ -52,10 +52,11 @@ This package provides the user-space management tools for VDO. make %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \ - defaultdocdir=%{_defaultdocdir} name=%{name} \ - python3_sitelib=%{python3_sitelib} mandir=%{_mandir} \ - unitdir=%{_unitdir} presetdir=%{_presetdir} sysconfdir=%{_sysconfdir} +make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= name=%{name} \ + bindir=%{_bindir} defaultdocdir=%{_defaultdocdir} libexecdir=%{_libexecdir} \ + mandir=%{_mandir} presetdir=%{_presetdir} \ + python3_sitelib=/%{python3_sitelib} sysconfdir=%{_sysconfdir} \ + unitdir=%{_unitdir} # Fix the python3 shebangs for file in %{_bindir}/vdo \ @@ -83,8 +84,7 @@ done %{_bindir}/vdoforcerebuild %{_bindir}/vdoformat %{_bindir}/vdosetuuid -%{_bindir}/vdo2lvm -%{_mandir}/man8/vdo2lvm.8.gz +%{_libexecdir}/vdoprepareforlvm %dir %{python3_sitelib}/%{name} %{python3_sitelib}/%{name}/__init__.py %{python3_sitelib}/%{name}/__pycache__/__init__.cpython-36.opt-1.pyc @@ -209,6 +209,7 @@ done %{_mandir}/man8/vdodumpconfig.8.gz %{_mandir}/man8/vdoforcerebuild.8.gz %{_mandir}/man8/vdoformat.8.gz +%{_mandir}/man8/vdoprepareforlvm.8.gz %{_mandir}/man8/vdosetuuid.8.gz %package support @@ -239,6 +240,12 @@ This package provides the user-space support tools for VDO. %{_mandir}/man8/vdoregenerategeometry.8.gz %changelog +* Fri Aug 20 2021 - Andy Walsh - 6.2.5.74-14 +- Renamed vdo2LVM to vdopreparelvm and moved its installation location to + /usr/libexec so that it is not in common default paths as this utility is + intended to be called from LVM, not directly by users. +- Related: rhbz#1986930 + * Thu Jul 22 2021 - Andy Walsh - 6.2.5.65-14 - Fixed Coverity scan issues. - Resolves: rhbz#1982878