Merge from i9-beta

i9
Arkady L. Shane 1 year ago
parent fe0e301bb7
commit 9dcf2c45a4
Signed by: tigro
GPG Key ID: 9C7900103E1C4F8B

2
.gitignore vendored

@ -1 +1 @@
SOURCES/osinfo-db-20221130.tar.xz
SOURCES/osinfo-db-20230518.tar.xz

@ -1 +1 @@
616479396f654ac9d8676bed4b07e02f9f093e23 SOURCES/osinfo-db-20221130.tar.xz
3bcd3e87c3f58bf4a62e2c75644c063a82462823 SOURCES/osinfo-db-20230518.tar.xz

@ -1,526 +0,0 @@
From aa68a741f6d821042ba9f6cba9b8b25788c02990 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 30 Nov 2022 18:10:19 +0100
Subject: [PATCH] Add prereleases: rhel-8.8 and rhel-9.2
Content-type: text/plain
See: https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/536
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2135751
Signed-off-by: Victor Toso <victortoso@redhat.com>
---
os/redhat.com/rhel-8-unknown.xml | 20 ++--
os/redhat.com/rhel-8.8.xml | 171 +++++++++++++++++++++++++++++++
os/redhat.com/rhel-9-unknown.xml | 20 ++--
os/redhat.com/rhel-9.2.xml | 169 ++++++++++++++++++++++++++++++
4 files changed, 360 insertions(+), 20 deletions(-)
create mode 100644 os/redhat.com/rhel-8.8.xml
create mode 100644 os/redhat.com/rhel-9.2.xml
diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
index 6371057..96e8c89 100644
--- a/os/redhat.com/rhel-8-unknown.xml
+++ b/os/redhat.com/rhel-8-unknown.xml
@@ -34,12 +34,12 @@
<family>linux</family>
<distro>rhel</distro>
<codename>Ootpa</codename>
- <upgrades id="http://redhat.com/rhel/8.7"/>
- <derives-from id="http://redhat.com/rhel/8.7"/>
+ <upgrades id="http://redhat.com/rhel/8.8"/>
+ <derives-from id="http://redhat.com/rhel/8.8"/>
<media arch="x86_64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>.*RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+ <volume-id>.*RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
</iso>
<kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd>
@@ -47,7 +47,7 @@
<media arch="aarch64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ <volume-id>RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
</iso>
<kernel>images/pxeboot/vmlinuz</kernel>
<initrd>images/pxeboot/initrd.img</initrd>
@@ -55,7 +55,7 @@
<media arch="ppc64le">
<iso>
<system-id>PPC</system-id>
- <volume-id>RHEL[_-]8[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ <volume-id>RHEL[_-]8[_-](9|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
</iso>
<kernel>ppc/ppc64/vmlinuz</kernel>
<initrd>ppc/ppc64/initrd.img</initrd>
@@ -63,34 +63,34 @@
<media arch="s390x">
<iso>
<system-id>LINUX</system-id>
- <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ <volume-id>RHEL-8-(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
</iso>
</media>
<tree arch="aarch64">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^8.([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+ <version>^8.(9|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
<arch>aarch64</arch>
</treeinfo>
</tree>
<tree arch="ppc64le">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>ppc64le</arch>
</treeinfo>
</tree>
<tree arch="s390x">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>s390x</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^8.(9|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/os/redhat.com/rhel-8.8.xml b/os/redhat.com/rhel-8.8.xml
new file mode 100644
index 0000000..f1cc1e0
--- /dev/null
+++ b/os/redhat.com/rhel-8.8.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://redhat.com/rhel/8.8">
+ <short-id>rhel8.8</short-id>
+ <name>Red Hat Enterprise Linux 8.8</name>
+ <version>8.8</version>
+ <vendor>Red Hat, Inc</vendor>
+ <vendor xml:lang="ka">Red Hat, Inc</vendor>
+ <vendor xml:lang="ko">Red Hat, Inc</vendor>
+ <vendor xml:lang="fi">Red Hat, Inc</vendor>
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
+ <vendor xml:lang="tr">Red Hat, Inc</vendor>
+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
+ <vendor xml:lang="it">Red Hat, Inc</vendor>
+ <vendor xml:lang="id">Red Hat, Inc</vendor>
+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
+ <vendor xml:lang="es">Red Hat, Inc</vendor>
+ <vendor xml:lang="de">Red Hat, Inc</vendor>
+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <codename>Ootpa</codename>
+ <upgrades id="http://redhat.com/rhel/8.7"/>
+ <derives-from id="http://redhat.com/rhel/8.7"/>
+ <release-status>prerelease</release-status>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <system-id>PPC</system-id>
+ <volume-id>RHEL[_-]8[_-]8[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-8-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^8.8(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^8.8(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^8.8(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^8.8(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+ <resources arch="ppc64le">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>4000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>35184372088832</ram>
+ </maximum>
+ </resources>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>26388279066624</ram>
+ </maximum>
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources>
+ <resources arch="s390x">
+ <minimum>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>340</n-cpus>
+ <ram>17592186044416</ram>
+ </maximum>
+ <network-install>
+ <ram>2147483648</ram>
+ </network-install>
+ </resources>
+ <resources arch="aarch64">
+ <minimum>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>256</n-cpus>
+ <ram>1649267441664</ram>
+ </maximum>
+ </resources>
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+ <installer>
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml
index 59e5046..fcb4a30 100644
--- a/os/redhat.com/rhel-9-unknown.xml
+++ b/os/redhat.com/rhel-9-unknown.xml
@@ -33,59 +33,59 @@
<family>linux</family>
<distro>rhel</distro>
<codename>Plow</codename>
- <upgrades id="http://redhat.com/rhel/9.1"/>
- <derives-from id="http://redhat.com/rhel/9.1"/>
+ <upgrades id="http://redhat.com/rhel/9.2"/>
+ <derives-from id="http://redhat.com/rhel/9.2"/>
<media arch="x86_64">
<iso>
- <volume-id>.*RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+ <volume-id>.*RHEL-9-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
</iso>
<kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd>
</media>
<media arch="aarch64">
<iso>
- <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ <volume-id>RHEL-9-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
</iso>
<kernel>images/pxeboot/vmlinuz</kernel>
<initrd>images/pxeboot/initrd.img</initrd>
</media>
<media arch="ppc64le">
<iso>
- <volume-id>RHEL[_-]9[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ <volume-id>RHEL[_-]9[_-]([3-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
</iso>
<kernel>ppc/ppc64/vmlinuz</kernel>
<initrd>ppc/ppc64/initrd.img</initrd>
</media>
<media arch="s390x">
<iso>
- <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ <volume-id>RHEL-9-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
</iso>
</media>
<tree arch="aarch64">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^9.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+ <version>^9.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
<arch>aarch64</arch>
</treeinfo>
</tree>
<tree arch="ppc64le">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^9.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>ppc64le</arch>
</treeinfo>
</tree>
<tree arch="s390x">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^9.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>s390x</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
- <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^9.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/os/redhat.com/rhel-9.2.xml b/os/redhat.com/rhel-9.2.xml
new file mode 100644
index 0000000..cb20484
--- /dev/null
+++ b/os/redhat.com/rhel-9.2.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://redhat.com/rhel/9.2">
+ <short-id>rhel9.2</short-id>
+ <name>Red Hat Enterprise Linux 9.2</name>
+ <version>9.2</version>
+ <vendor>Red Hat, Inc</vendor>
+ <vendor xml:lang="ka">Red Hat, Inc</vendor>
+ <vendor xml:lang="ko">Red Hat, Inc</vendor>
+ <vendor xml:lang="fi">Red Hat, Inc</vendor>
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
+ <vendor xml:lang="tr">Red Hat, Inc</vendor>
+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
+ <vendor xml:lang="it">Red Hat, Inc</vendor>
+ <vendor xml:lang="id">Red Hat, Inc</vendor>
+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
+ <vendor xml:lang="es">Red Hat, Inc</vendor>
+ <vendor xml:lang="de">Red Hat, Inc</vendor>
+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <codename>Plow</codename>
+ <upgrades id="http://redhat.com/rhel/9.1"/>
+ <derives-from id="http://redhat.com/rhel/9.1"/>
+ <release-status>prerelease</release-status>
+ <!-- RHEL 9.2 entries have to cope both with 9.2 and 9.2.x regexes for
+ medias' volume-id and trees' version -->
+ <media arch="x86_64">
+ <iso>
+ <volume-id>RHEL-9-2-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <volume-id>RHEL[_-]9[_-]2[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <volume-id>RHEL-9-2-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <volume-id>RHEL-9-2-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.2(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+ <resources arch="ppc64le">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>4000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>35184372088832</ram>
+ </maximum>
+ </resources>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>26388279066624</ram>
+ </maximum>
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources>
+ <resources arch="s390x">
+ <minimum>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>340</n-cpus>
+ <ram>17592186044416</ram>
+ </maximum>
+ <network-install>
+ <ram>2147483648</ram>
+ </network-install>
+ </resources>
+ <resources arch="aarch64">
+ <minimum>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>256</n-cpus>
+ <ram>1649267441664</ram>
+ </maximum>
+ </resources>
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+ <installer>
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
--
2.38.1

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmOHMNQACgkQl9kSPeN6
SE9V/A/5AZ8TsHOX68X2BAwt6O6LieWQmzBn6PVqeGSdvaahfzyBjRZ4zPCLtkzB
Js9JARw3twe8gckRotCFJLVb6gC4cJRC0tXYroLJBXDLz4ySThXaEBRIN9voL1Z2
IzC5NN/pry8+iV912e5pShPzjuhHI95nu/DSottsgQNHIW2t0UNkZbLhSbvzz+XD
BiPo/ivdYO4wN4yoNCDs+uQD+icoZULBB7Re8l4wRyoSh0p9eYo8h+iaL340e/dv
0DKIsHTSvCmC7a6LgovYK9GlTk4H5CnzmfXyEYtO5HhTguST7jRh/ah6Vngpyrs1
4sZHYGfnePSit6/IJB8mdBtZ8F8I8I6/mihYnEeCSCdFZAFGl0k7hjjzULuB/lU7
GjFYjwpEMeT5bICDnVxYVEX8Lvd6f1hs2ByIqTh4o418BVDtDgy2by3SzmVMaBST
xqIodAbrMH24EX2tQrwNS38UX/CwrWcIwYqpLzIa7iKpm9lqzXMBpICDOCdsOpqe
xVhxH/ORNSYSIqVuP4FQu9uO//EouIaaBXcSGZGqe2zQXHEBRtvM+Mq0mkAMsQ+q
LmiUXP39Cp46QMYg6fl1XNZjdAc70co/NENVViEv/cOwVV3P6kfVJzFfPbnkvNjK
hES62WQ+p2ZldWhAdotjys8KN23KvDE06aPnXUyqduXyg71fusg=
=DW/D
-----END PGP SIGNATURE-----

@ -1,17 +1,13 @@
# -*- rpm-spec -*-
%define PatchedSource ../%{name}-%{version}-patched.tar.xz
%define ExtractedSource %{name}-%{version}
Summary: osinfo database files
Name: osinfo-db
Version: 20221130
Version: 20230518
Release: 1%{?dist}.inferit.1
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-Add-prereleases-rhel-8.8-and-rhel-9.2.patch
Patch0002: 0001-Added-MSVSphere-support.patch
BuildRequires: intltool
BuildRequires: git-core
@ -27,12 +23,10 @@ provisioning of new virtual machines
%prep
%autosetup -S git_am
%build
rm -rf ../%{ExtractedSource}/.git
tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
%install
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
#repack
tar -c --exclude=.git -af /tmp/%{name}-%{version}.tar.xz -C %{_builddir} %{name}-%{version}
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo /tmp/%{name}-%{version}.tar.xz
%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 {} +
@ -50,12 +44,24 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
%{_datadir}/osinfo/schema
%changelog
* Mon Dec 4 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 20230518-1.inferit.1
- Fix applying patch for MSVSphere support
- Update to new release (v20230518)
Resolves: rhbz#2184784
* Wed Sep 13 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 20221130-1.inferit.1
- Change urls from msvsphere.ru to msvsphere-os.ru
* Thu Aug 24 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 20221130-1.inferit
- Added MSVSphere support
* Tue May 23 2023 Victor Toso <victortoso@redhat.com> - 20230518-1
- Update to new release (v20230518)
Resolves: rhbz#2184784
* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 20221130-1
- Rebuilt for MSVSphere 9.2 beta
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 20220727-3
- Rebuilt for MSVSphere 9.1.

Loading…
Cancel
Save