From 35d43face3e0d519f97f7b0abf119c15dcc05419 Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Tue, 8 Sep 2020 09:49:34 +1000 Subject: [PATCH] fix osinfo installation directory. sync with virtio-win-pkg-script - Resolves: rhbz#1746667 Signed-off-by: Vadim Rozenfeld --- virtio-win.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/virtio-win.spec b/virtio-win.spec index 495fc4d..fa1510d 100644 --- a/virtio-win.spec +++ b/virtio-win.spec @@ -3,7 +3,7 @@ # Note: This spec file is largely shared with the public virtio-win drivers # shipped on fedora sites. The canonical location is here: # -# https://github.com/crobinso/virtio-win-pkg-scripts +# https://github.com/virtio-win/virtio-win-pkg-scripts # # If you make any changes to this file that affect the RPM content (but not # version numbers or changelogs, etc), submit a patch to the upstream spec. @@ -179,17 +179,17 @@ add_link _servers_amd64.vfd %endif %if 0%{?rhel} -%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-7.d/ -%{__cp} %{SOURCE70} %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-7.d/ +%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-7.d/ +%{__cp} %{SOURCE70} %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-7.d/ -%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-8.d/ -%{__cp} %{SOURCE71} %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-8.d/ +%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-8.d/ +%{__cp} %{SOURCE71} %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-8.d/ -%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-8.1.d/ -%{__cp} %{SOURCE72} %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-8.1.d/ +%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-8.1.d/ +%{__cp} %{SOURCE72} %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-8.1.d/ -%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-10.d/ -%{__cp} %{SOURCE73} %{buildroot}/%{_datadir}/osinfo-db/os/microsoft.com/win-10.d/ +%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-10.d/ +%{__cp} %{SOURCE73} %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-10.d/ %endif %{__cp} -a rpm-drivers %{buildroot}/%{_datadir}/%{name}/drivers @@ -268,10 +268,10 @@ add_link _servers_amd64.vfd # osinfo-db drop-in files %if 0%{?rhel} -%{_datadir}/osinfo-db/os/microsoft.com/win-7.d/virtio-win-pre-installable-drivers-win-7.xml -%{_datadir}/osinfo-db/os/microsoft.com/win-8.d/virtio-win-pre-installable-drivers-win-8.xml -%{_datadir}/osinfo-db/os/microsoft.com/win-8.1.d/virtio-win-pre-installable-drivers-win-8.1.xml -%{_datadir}/osinfo-db/os/microsoft.com/win-10.d/virtio-win-pre-installable-drivers-win-10.xml +%{_datadir}/osinfo/os/microsoft.com/win-7.d/virtio-win-pre-installable-drivers-win-7.xml +%{_datadir}/osinfo/os/microsoft.com/win-8.d/virtio-win-pre-installable-drivers-win-8.xml +%{_datadir}/osinfo/os/microsoft.com/win-8.1.d/virtio-win-pre-installable-drivers-win-8.1.xml +%{_datadir}/osinfo/os/microsoft.com/win-10.d/virtio-win-pre-installable-drivers-win-10.xml %endif # .json files