From c71e60c76cb86f838b9564d7666ddcfa56826e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 15 Jan 2021 17:44:42 +0000 Subject: [PATCH] Rebase to 7.0.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- libvirt.spec | 24 +++++++++++++++++------- sources | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 007bcbc..f901b48 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -6,7 +6,7 @@ %define min_rhel 7 %define min_fedora 31 -%if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel}) +%if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel} %define supported_platform 1 %else %define supported_platform 0 @@ -213,8 +213,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 6.10.0 -Release: 2%{?dist}.1 +Version: 7.0.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -735,6 +735,9 @@ Requires: xz %if 0%{?fedora} || 0%{?rhel} > 7 Requires: systemd-container %endif + %if 0%{?fedora} || 0%{?rhel} > 7 +Requires: swtpm-tools + %endif %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing @@ -1439,9 +1442,13 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : %post daemon-config-nwfilter -cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/ -# libvirt saves these files with mode 600 -chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml +for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do + sysconfdir_file=%{_sysconfdir}/libvirt/nwfilter/$(basename "$datadir_file") + if [ ! -f "$sysconfdir_file" ]; then + # libvirt saves these files with mode 600 + install -m 0600 "$datadir_file" "$sysconfdir_file" + fi +done # Make sure libvirt picks up the new nwfilter defininitons mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : @@ -1740,7 +1747,7 @@ exit 0 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/ -%dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/libvirt/qemu/ +%dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/ %{_bindir}/virt-qemu-run %{_mandir}/man1/virt-qemu-run.1* %endif @@ -1943,6 +1950,9 @@ exit 0 %changelog +* Fri Jan 15 2021 Daniel P. Berrangé - 7.0.0-1 +- Rebase to 7.0.0 release + * Fri Dec 04 2020 Cole Robinson - 6.10.0-2.1 - Rebuild for wireshark soname bump diff --git a/sources b/sources index 83587a1..4248886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-6.10.0.tar.xz) = 42e77a3542e9f15c3aeaab1639a80ee6539cb0f09a1e8324aa0059a8f6041acf20263a9556ac65c9a7a14693b0756020231085e4556ff54cf8329110018a2485 +SHA512 (libvirt-7.0.0.tar.xz) = dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343