From 295d1eb8846a0e6efabe295f93d4cc7efe5bb7e8 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Tue, 30 Aug 2022 17:57:25 +0200 Subject: [PATCH] Update to release v20220830 Signed-off-by: Victor Toso --- ...to-images-pxeboot-for-Fedora-unknown.patch | 53 ------------------- osinfo-db.spec | 25 +++------ sources | 4 +- 3 files changed, 10 insertions(+), 72 deletions(-) delete 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 deleted file mode 100644 index 68668d3..0000000 --- a/0001-data-switch-to-images-pxeboot-for-Fedora-unknown.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 844af68bfb2a6ef84871273c5b43864b2e154181 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -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é -(cherry picked from commit c1d69e2b1da6038a166391c9a316f8e45c330870) -Signed-off-by: Victor Toso ---- - 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 @@ - - Fedora-.*-dvd-x86_64-(3[7-9]|[4-9][0-9]) - -- isolinux/vmlinuz -- isolinux/initrd.img -+ images/pxeboot/vmlinuz -+ images/pxeboot/initrd.img - - - - Fedora-.*-Live-(3[7-9]|[4-9][0-9]).* - -- isolinux/vmlinuz -- isolinux/initrd.img -+ images/pxeboot/vmlinuz -+ images/pxeboot/initrd.img - - - --- -2.37.2 - diff --git a/osinfo-db.spec b/osinfo-db.spec index 203335f..763443c 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -1,8 +1,5 @@ # -*- 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} @@ -10,15 +7,13 @@ Summary: osinfo database files Name: osinfo-db -Version: 20220727 -Release: 3%{?dist} +Version: 20220830 +Release: 1%{?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 @@ -50,23 +45,16 @@ 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 %{PatchedSource} +osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0} %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 %{PatchedSource} -osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSource} +osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{SOURCE0} +osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0} %endif %files @@ -105,6 +93,9 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSo %endif %changelog +* Tue Aug 30 2022 Victor Toso - 20220830-1 +- Update to new release (v20220830) + * Fri Aug 26 2022 Victor Toso - 20220727-3 - Switch images/pxeboot in Fedora https://bugzilla.redhat.com/show_bug.cgi?id=2103835 diff --git a/sources b/sources index 11018cb..998acb9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (osinfo-db-20220727.tar.xz) = 1b0bbf64e6808e06bd3d40ef4da932a7f96957a79fc4a1d8d11074da25acd81b016aaf5816dcf39c6f28cf0a17734aab8238d25d2628ee05e80a37a09ad363f3 -SHA512 (osinfo-db-20220727.tar.xz.asc) = e8fc39f0ad20657696176187737064c8cec3b9038a3d73c60b3f0b97fa657c5a10d3ba36fec9edf02dfc70a6557a1d1e0a94c1960382bc6a481e67b559712815 +SHA512 (osinfo-db-20220830.tar.xz) = 8d728ce1afab9855430fa40595f8c156e72c155cd91e0064a9922a49e948116d5f49a75c89b642c5804b7f43f73e4d81ba179f8dc8cbeef8f10ccef7f9a696fb +SHA512 (osinfo-db-20220830.tar.xz.asc) = 570000269d23034d61d15fd96060797ec17aec6c758a9b396ad55758c3d51ec01681222a9123a78fed30eaaaa56d2af9116635784f7792a8687b07c209b97414