From bcc2edb4aa2e308b4cbce13786a400f178502ab2 Mon Sep 17 00:00:00 2001
From: Victor Toso <victortoso@redhat.com>
Date: Fri, 26 Aug 2022 20:50:21 +0200
Subject: [PATCH] Switch images/pxeboot in Fedora

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103835
Signed-off-by: Victor Toso <victortoso@redhat.com>
---
 ...to-images-pxeboot-for-Fedora-unknown.patch | 53 +++++++++++++++++++
 osinfo-db.spec                                | 24 +++++++--
 2 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 0001-data-switch-to-images-pxeboot-for-Fedora-unknown.patch

diff --git a/0001-data-switch-to-images-pxeboot-for-Fedora-unknown.patch b/0001-data-switch-to-images-pxeboot-for-Fedora-unknown.patch
new file mode 100644
index 0000000..68668d3
--- /dev/null
+++ b/0001-data-switch-to-images-pxeboot-for-Fedora-unknown.patch
@@ -0,0 +1,53 @@
+From 844af68bfb2a6ef84871273c5b43864b2e154181 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 6 Jul 2022 04:54:13 -0400
+Subject: [PATCH] data: switch to images/pxeboot for Fedora unknown
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Content-type: text/plain
+
+Copy of c9eb52afff644c2768674e044498c5908dab5629, but for Fedora
+'unknown' instead of 'rawhide'.
+
+Fedora 37 rawhide has dropped syslinux in favour of grub for ISO
+boot and as such, the 'isolinux/' directory no longer exists.
+The kernel/initrd files in that directory held 100% identical
+content to the files in 'images/pxeboot/', so this is a straight
+swap.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=2103835
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit c1d69e2b1da6038a166391c9a316f8e45c330870)
+Signed-off-by: Victor Toso <victortoso@redhat.com>
+---
+ os/fedoraproject.org/fedora-unknown.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/os/fedoraproject.org/fedora-unknown.xml b/os/fedoraproject.org/fedora-unknown.xml
+index e15d7cd..9ece2ff 100644
+--- a/os/fedoraproject.org/fedora-unknown.xml
++++ b/os/fedoraproject.org/fedora-unknown.xml
+@@ -44,15 +44,15 @@
+       <iso>
+         <volume-id>Fedora-.*-dvd-x86_64-(3[7-9]|[4-9][0-9])</volume-id>
+       </iso>
+-      <kernel>isolinux/vmlinuz</kernel>
+-      <initrd>isolinux/initrd.img</initrd>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
+     </media>
+     <media arch="x86_64" live="true">
+       <iso>
+         <volume-id>Fedora-.*-Live-(3[7-9]|[4-9][0-9]).*</volume-id>
+       </iso>
+-      <kernel>isolinux/vmlinuz</kernel>
+-      <initrd>isolinux/initrd.img</initrd>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
+     </media>
+     <tree arch="x86_64">
+       <treeinfo>
+-- 
+2.37.2
+
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 2286d75..203335f 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -1,5 +1,8 @@
 # -*- rpm-spec -*-
 
+%define PatchedSource ../%{name}-%{version}-patched.tar.xz
+%define ExtractedSource %{name}-%{version}
+
 %define with_mingw 0
 %if 0%{?fedora}
     %define with_mingw 0%{!?_without_mingw:1}
@@ -8,12 +11,14 @@
 Summary: osinfo database files
 Name: osinfo-db
 Version: 20220727
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
 Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
 URL: http://libosinfo.org/
+Patch0001: 0001-data-switch-to-images-pxeboot-for-Fedora-unknown.patch
 BuildRequires: intltool
+BuildRequires: git-core
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
 Requires: hwdata
@@ -45,16 +50,23 @@ operating systems for use with virtualization provisioning tools
 
 %endif
 
+%prep
+%autosetup -S git_am
+
+%build
+rm -rf ../%{ExtractedSource}/.git
+tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
+
 %install
-osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 %if 0%{?rhel}
 # Remove the upstream virtio-win / spice-guest-tools drivers
 find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
 %endif
 
 %if %{with_mingw}
-osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{SOURCE0}
-osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
+osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{PatchedSource}
+osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSource}
 %endif
 
 %files
@@ -93,6 +105,10 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
 %endif
 
 %changelog
+* Fri Aug 26 2022 Victor Toso <victortoso@redhat.com> - 20220727-3
+- Switch images/pxeboot in Fedora
+  https://bugzilla.redhat.com/show_bug.cgi?id=2103835
+
 * Tue Aug 23 2022 Daniel P. Berrangé <berrange@redhat.com> - 20220727-2
 - Pull in mingw sub-packages