From 4137b4e85f8e47b983ee90eced6c6cdba733ae8a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Nov 2025 08:57:36 +0000 Subject: [PATCH] import CS osinfo-db-20250606-1.el10 --- .gitignore | 2 +- ...-fix-x86_64-pxeboot-set-release-date.patch | 55 ------------------- osinfo-db-20250124.tar.xz.asc | 16 ------ osinfo-db-20250606.tar.xz.asc | 16 ++++++ osinfo-db.spec | 26 +++------ sources | 2 +- 6 files changed, 25 insertions(+), 92 deletions(-) delete mode 100644 0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch delete mode 100644 osinfo-db-20250124.tar.xz.asc create mode 100644 osinfo-db-20250606.tar.xz.asc diff --git a/.gitignore b/.gitignore index 0b838fc..825d1c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -osinfo-db-20250124.tar.xz +osinfo-db-20250606.tar.xz diff --git a/0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch b/0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch deleted file mode 100644 index 5928cb0..0000000 --- a/0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8be0d55bda7ee7ec8fea38cae5e0e65eaf134b29 Mon Sep 17 00:00:00 2001 -From: Victor Toso -Date: Sun, 31 Aug 2025 08:42:11 +0200 -Subject: [PATCH] rhel10: fix x86_64 pxeboot, set release date - -upstream: - - 9c808d5b rhel10: set x86_64 pxeboot path - - 2a374acd rhel10: set release date, add test data - -Resolves: RHEL-109774 -Signed-off-by: Victor Toso ---- - os/redhat.com/rhel-10-unknown.xml | 4 ++-- - os/redhat.com/rhel-10.0.xml | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/os/redhat.com/rhel-10-unknown.xml b/os/redhat.com/rhel-10-unknown.xml -index ee3519e..df22aca 100644 ---- a/os/redhat.com/rhel-10-unknown.xml -+++ b/os/redhat.com/rhel-10-unknown.xml -@@ -39,8 +39,8 @@ - - RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64 - -- isolinux/vmlinuz -- isolinux/initrd.img -+ images/pxeboot/vmlinuz -+ images/pxeboot/initrd.img - - - -diff --git a/os/redhat.com/rhel-10.0.xml b/os/redhat.com/rhel-10.0.xml -index 9f11c48..d44e415 100644 ---- a/os/redhat.com/rhel-10.0.xml -+++ b/os/redhat.com/rhel-10.0.xml -@@ -35,13 +35,13 @@ - Coughlan - - -- prerelease -+ 2025-05-20 - - - RHEL-10-0(-[0-9]|[1-9][0-9])?.*x86_64 - -- isolinux/vmlinuz -- isolinux/initrd.img -+ images/pxeboot/vmlinuz -+ images/pxeboot/initrd.img - - - --- -2.51.0 - diff --git a/osinfo-db-20250124.tar.xz.asc b/osinfo-db-20250124.tar.xz.asc deleted file mode 100644 index d6cb3b0..0000000 --- a/osinfo-db-20250124.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmeTat8ACgkQl9kSPeN6 -SE94zg/+Jslb+0CDVhWzlBTF8/QmM5lnopI1L76THCdrKuJ3wntEZEL+DvfIExKv -d16JEyfZXbBqx8uY+WSXdDbyUnveSBPVzysPMQ5ZJYj4bVFsT0ET+Ce2Rdp/lmLy -dek2O97qmok6DhDb6ctO97uUnO73/onR4sIbZ0F3Mvn4HJkR7s5nTO3BehrJPJV0 -+vWo82MWyV39+SzLtbh0aYIDnohK6JLnjdEwambSHDrH+shyFjOBsHYQZUBWBi7c -7s0OlQAJJ+NSP75nxaHOQb8rn3nCAW9EHXT0d0OlTCy0tdtm7Bjh/JPe2cCgY19h -icP/2uHLFhE/5+g9pHyeX0xe/PE4flz6cXY8vvjwOaxZv1W5mQ+wg42xqOHm2LZQ -uf1WuzS/BiTsfWTYd2oVnL3JtrIAExpTzfAuFFkLkVnpFZZ19My9UUM5WuBgdDTh -mwycMciYDh+MScJQ7tHv8t5hj7c6sCuMHS25C1vK8Fs9vfjWMvOA4kGsV/oMFwJk -2ZNx5UMHGvnECCI8TGtXM4neRJhbmGHaW0y67RpPaZ1FiH65iQM2JAzxoPI1cMcz -DXbE60DXAqA7AGeg7Bepmpx9jjr/+BC+mEPclLIbawZOCAldOM9Yr0UXKFL+wHWM -D4d/kA5qscXdjPuZyKpZwtP0Pkkxnefi66eW6UZ1vSwj1er7J70= -=WSIF ------END PGP SIGNATURE----- diff --git a/osinfo-db-20250606.tar.xz.asc b/osinfo-db-20250606.tar.xz.asc new file mode 100644 index 0000000..9c2703e --- /dev/null +++ b/osinfo-db-20250606.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmhCx6kACgkQl9kSPeN6 +SE9A/g//TB0f/KGBgzgyNEDLdI7sUMjB9soaYHtYqgQh3F11eH68B50x24V1SFMF +g98osPGitiUOtFaQdl1kQMGc46HQcoWFctoVX66jPgcp+5WdnrWNitDB4OMrzX5Q +L0wgJ5zvyp9C9yjsQuFD0eh6iCXGW/WkhaktnUFC08UamEh502+Sj59V5qNDV2DJ +JppYE7cQIOZe2TmTZCCV9r4rWwS1Qqt7Yd9mC9fbh4V3qL1In59Zw+vswVX8ORqe +KXyCqOlQ5DdiIig4pciqW7NLkdVhOXfYXaRrMqjF2v2CBO4XSHvxcDsjq1YHo8GA +2T73mKiLcK8u6TwMlMpLErzzMLpOpxEhI8/3YfRAkBMywCVzOTIOghz8j8TzCd5R +0U+vsfaKY1e298sIEHpvzfcNcIj+8i+5lUUJpKG3LGMMxIByN4ZofVyFgwVDtLR7 +lJ1FJ4E0IZRy3s4acblTmi0g1RMZ2is8vM8Q5q9luqJmKsbMrjU+qRGnM5jtZvqF +E//9Z0kpTohb1J8bl/6KiN+BUYy2xKdSGQ5s1q1bGe1cEaLS+mEWsaw/N75EdZZA ++Y5WyDr0Xsmqqpb4dKiAXUU06xrc1sMFbrfIZlOZOKnLyygDimj5FXB3uZgT4+7a +lI33i2yYycTWX8hilHRuJ/KFOoZGzHkp+9glHUmbe6I6DNNRSHE= +=JNKe +-----END PGP SIGNATURE----- diff --git a/osinfo-db.spec b/osinfo-db.spec index 6c7a7a3..9a0fa06 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -10,9 +10,6 @@ # -*- 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} @@ -20,15 +17,13 @@ Summary: osinfo database files Name: osinfo-db -Version: 20250124 +Version: 20250606 Release: %autorelease License: GPL-2.0-or-later 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-rhel10-fix-x86_64-pxeboot-set-release-date.patch BuildRequires: intltool -BuildRequires: git-core BuildRequires: osinfo-db-tools BuildArch: noarch Requires: hwdata @@ -60,23 +55,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 @@ -116,8 +104,8 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSo %changelog ## START: Generated by rpmautospec -* Sun Aug 31 2025 Victor Toso - 20250124-2 -- Fixes x86_64 pxeboot in RHEL 10 +* Fri Jun 06 2025 Victor Toso - 20250606-1 +- Update to v20250606 * Mon Jan 27 2025 Victor Toso - 20250124-1 - Update to v20250124 diff --git a/sources b/sources index 6053e2b..9136808 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osinfo-db-20250124.tar.xz) = 3165ea461ee3c00d42c016724579c787337837cba8a6e5c82f4c7d573f64d2f81cf1fa0a6d8d9f8e24b0badcd593de3caca6135bfa74d8e69eff6d2f26ba1803 +SHA512 (osinfo-db-20250606.tar.xz) = 5ca94d83a30ac05aae47155a483718b1e6061d0935407fa394efb3f5a2e51c9956a63b6a1ad37d557192468843593219faaf3e8ca0748a9c695cd74f933c5f78