From daefaea87c844691d3c0afba014484747d1f55a2a187dd7242889d9b0d49880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 17:19:36 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main hyper-v revision aad902319f1097acf6e6a3ece0de84fe --- hyper-v.changes | 11 +++++++++++ hyper-v.spec | 20 +++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/hyper-v.changes b/hyper-v.changes index 353dfea..f2bee65 100644 --- a/hyper-v.changes +++ b/hyper-v.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Apr 23 10:01:10 UTC 2024 - pgajdos@suse.com + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang macro, [bsc#1212476] + +------------------------------------------------------------------- +Thu Feb 22 07:56:09 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu Aug 20 12:12:12 UTC 2020 - ohering@suse.de diff --git a/hyper-v.spec b/hyper-v.spec index c4a1eeb..359558b 100644 --- a/hyper-v.spec +++ b/hyper-v.spec @@ -1,7 +1,7 @@ # # spec file for package hyper-v # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,6 +24,7 @@ Name: hyper-v ExclusiveArch: %ix86 x86_64 aarch64 %{?systemd_requires} +BuildRequires: python-rpm-macros BuildRequires: pkgconfig(systemd) # Due to usage of char device instead of netlink Conflicts: kernel < 4.2 @@ -32,7 +33,7 @@ License: GPL-2.0-only Group: System/Kernel Supplements: modalias(dmi:*svnMicrosoftCorporation*pnVirtualMachine*rnVirtualMachine*) Supplements: modalias(pci:v00001414d00005353sv*sd*bc*sc*i*) -Url: http://www.kernel.org +URL: http://www.kernel.org # Arbitrary version number Version: 8 Release: 0 @@ -59,7 +60,7 @@ cp -vL %{S:9} %{hv_kvp_daemon}.h cp -vL %{S:10} . cp -vL %{S:12} %{hv_vss_daemon}.c cp -vL %{S:14} %{hv_fcopy_daemon}.c -%patch0 -p1 +%patch -P 0 -p1 mv `basename %{S:10}` %{hv_kvp_daemon}.c %build @@ -109,15 +110,7 @@ mkdir -p $RPM_BUILD_ROOT%{helper_dir}/bin install -m755 %{hv_kvp_daemon} $RPM_BUILD_ROOT${bindir} install -m755 %{hv_vss_daemon} $RPM_BUILD_ROOT${bindir} install -m755 %{hv_fcopy_daemon} $RPM_BUILD_ROOT${bindir} -sed ' -1 { -%if 0%{?suse_version} > 1315 -s@^.*@#!%{_bindir}/python3@ -%else -s@^.*@#!%{_bindir}/python2@ -%endif -} -' %{S:0} > $RPM_BUILD_ROOT%{_sbindir}/lsvmbus +cp -avL %{S:0} $RPM_BUILD_ROOT%{_sbindir}/lsvmbus chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/lsvmbus cp -avL %{S:20} $RPM_BUILD_ROOT%{helper_dir}/bin/hv_get_dhcp_info cp -avL %{S:21} $RPM_BUILD_ROOT%{helper_dir}/bin/hv_get_dns_info @@ -210,6 +203,7 @@ fi EOF chmod 755 $RPM_BUILD_ROOT${bindir}/${helper} # +%python3_fix_shebang %files %doc kvptest.ps1.txt