From 802dbdd73bad1531f8e7eb9c096d2cacd8214c71 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Tue, 29 Nov 2022 16:20:09 +0100
Subject: [PATCH] Fix permissions on lvresize_fs_helper

Resolves: #2141837
---
 lvm2.spec       | 23 +++++++++++++----------
 tests/tests.yml |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lvm2.spec b/lvm2.spec
index 5d97947..996206b 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -49,7 +49,7 @@
 %global commit 4a1f6173d29a7d7ecab14a9313000aa5f81170d0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %endif
-#%%global rel_suffix .bz2114006
+#%%global rel_suffix .bz2141837
 
 # Do not reset Release to 1 unless both lvm2 and device-mapper
 # versions are increased together.
@@ -63,7 +63,7 @@ Version: 2.03.17
 #Release: 0.1.20211115git%{shortcommit}%{?dist}%{?rel_suffix}
 Release: 4%{?dist}%{?rel_suffix}
 %else
-Release: 1%{?dist}%{?rel_suffix}
+Release: 2%{?dist}%{?rel_suffix}
 %endif
 License: GPLv2
 URL: http://sourceware.org/lvm2
@@ -198,14 +198,14 @@ or more physical volumes and creating one or more logical volumes
   --enable-editline \
   --disable-readline
 
-%make_build
+V=1 %make_build
 
 %install
-%make_install
-make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
-make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
-make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT
-make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
+V=1 %make_install
+V=1 make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
+V=1 make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
+V=1 make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT
+V=1 make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
 %if %{enable_testsuite}
 %make_install -C test
 %endif
@@ -311,7 +311,7 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || :
 %{_sbindir}/vgs
 %{_sbindir}/vgscan
 %{_sbindir}/vgsplit
-%{_libexecdir}/lvresize_fs_helper
+%attr(755, -, -) %{_libexecdir}/lvresize_fs_helper
 %{_mandir}/man5/lvm.conf.5.gz
 %{_mandir}/man7/lvmautoactivation.7.gz
 %{_mandir}/man7/lvmcache.7.gz
@@ -705,8 +705,11 @@ An extensive functional testsuite for LVM2.
 %endif
 
 %changelog
+* Tue Nov 29 2022 Marian Csontos <mcsontos@redhat.com> - 2.03.17-2
+- Fix permissions on lvresize_fs_helper.
+
 * Thu Nov 10 2022 Marian Csontos <mcsontos@redhat.com> - 2.03.17-1
-- Update to upstream version 2.03.16.
+- Update to upstream version 2.03.17.
 - See WHATS_NEW and WHATS_NEW_DM for more information.
 
 * Fri Jul 29 2022 Marian Csontos <mcsontos@redhat.com> - 2.03.16-3
diff --git a/tests/tests.yml b/tests/tests.yml
index fe0467a..e3a81d6 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -101,7 +101,7 @@
         - mdadm
         # No vdo package in EL9 yet
         # - https://issues.redhat.com/browse/RHELPLAN-77194
-        #- vdo
+        - vdo
         - kmod-kvdo
       state: present