diff --git a/.gitignore b/.gitignore index e94c36f..e046da9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20240701.tar.xz +SOURCES/osinfo-db-20250124.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index 821cc46..6fd3b86 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -43b0f08a371095c22285e4cbe550cafaa5decd2e SOURCES/osinfo-db-20240701.tar.xz +3792b7d997bd37be1c15c9484378006d40c91506 SOURCES/osinfo-db-20250124.tar.xz diff --git a/SOURCES/osinfo-db-20240701.tar.xz.asc b/SOURCES/osinfo-db-20240701.tar.xz.asc deleted file mode 100644 index 79bcf5c..0000000 --- a/SOURCES/osinfo-db-20240701.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmaCy9kACgkQl9kSPeN6 -SE9RBQ//fvv3bA8iSnzOivi63lf+xsJlR2E+aMYxQrcXbtUHHLRvViVB4BUoqID9 -rD/+I0uhf9KCG50TQlsfUsRJ9SiCZJ4UQODBzigsaZStuMvC/9nBGfajDA+sH66A -03P0ERO7wiWXorYISCu18TrJ85mdat/04C8317PMYLuaQUkmEaBAEnGeMBqVAKxK -172OhizLB6NSZA4ATOx2qIk2IvH7v0dA8ugfEd5Ou3BWyIWJfPD0nmVJUgjmX0mO -LbUAxeWilH7ROls/EPoJjED8Ne6xfw4u+vFKZo1Jp45h1F2obCtsre1xmXr5uiNV -eh5pQnc45xFI/KLpZLMwcrGT5f8EJzvErtod1ypeRcSGFFD4dsWS0+KH9FLZv7ei -iXAQTqs9OmP98V6LRI6PXiiURApzA4YF8cBLeSNk6Uzyft2vt1+C2UOXE6K+zu8n -dwszQI+pu/AVBjir5Cp9YtNP0OS5J3+hYJ7Oz8UJkmt9WNU1VTIXTemzHDB4Nuxa -srZ+M6RVRtDYMHMM9nM/cYDSMUgrUDKcxAwMdWAMMT2wk1lkPU/45pi3KiiziGrj -nrnPDVXkY1vBaKXBaYGt0XHN0DYofcDauIvdlk1VG5XL3Lsek5WgWj64ltXnAyJM -ls9t5GKESjrH13+qDdE4c2yNmWuz4uzRWzH8QuKOpr/79YZCMW4= -=oWKM ------END PGP SIGNATURE----- diff --git a/SOURCES/osinfo-db-20250124.tar.xz.asc b/SOURCES/osinfo-db-20250124.tar.xz.asc new file mode 100644 index 0000000..d6cb3b0 --- /dev/null +++ b/SOURCES/osinfo-db-20250124.tar.xz.asc @@ -0,0 +1,16 @@ +-----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/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 1036f21..3ea6cc4 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -1,15 +1,19 @@ # -*- rpm-spec -*- +%define with_mingw 0 +%if 0%{?fedora} + %define with_mingw 0%{!?_without_mingw:1} +%endif + Summary: osinfo database files Name: osinfo-db -Version: 20240701 -Release: 2%{?dist} +Version: 20250124 +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/ BuildRequires: intltool -BuildRequires: git-core BuildRequires: osinfo-db-tools BuildArch: noarch Requires: hwdata @@ -19,16 +23,18 @@ The osinfo database provides information about operating systems and hypervisor platforms to facilitate the automated configuration and provisioning of new virtual machines -%prep -%autosetup -S git_am - %install -osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0} +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 %{SOURCE0} +osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0} +%endif + %files %dir %{_datadir}/osinfo/ %{_datadir}/osinfo/VERSION @@ -41,6 +47,14 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - %{_datadir}/osinfo/schema %changelog +* Mon Jan 27 2025 Victor Toso - 20250124-1 +- Update to new release (v20250124) + Resolves: rhbz#RHEL-76320 + +* Thu Sep 05 2024 Victor Toso - 20240701-3 +- Add rhel 10.0 and rhel-10-unknown metadata + Related: rhbz#RHEL-56790 + * Fri Aug 02 2024 Victor Toso - 20240701-2 - Fix changelog Related: rhbz#RHEL-52519