From a6d76e89f98aa8f66af37d98591a430907245fea Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Fri, 24 Jan 2025 16:21:54 +0300
Subject: [PATCH] Added MSVSphere support

---
 SOURCES/0001-Added-MSVSphere-support.patch | 316 +++++++++++++++++++++
 SPECS/osinfo-db.spec                       |  14 +-
 2 files changed, 328 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/0001-Added-MSVSphere-support.patch

diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch
new file mode 100644
index 0000000..f0e0d8d
--- /dev/null
+++ b/SOURCES/0001-Added-MSVSphere-support.patch
@@ -0,0 +1,316 @@
+From a8547f63d31712654beaf5374b333592cd0f434b Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
+Date: Fri, 24 Jan 2025 16:15:29 +0300
+Subject: [PATCH] Added MSVSphere support
+
+---
+ .../redhat.com/rhel-kickstart-desktop.xml     |  7 ++
+ .../redhat.com/rhel-kickstart-jeos.xml        |  7 ++
+ os/msvsphere-os.ru/msvsphere-10.xml           | 84 +++++++++++++++++++
+ os/msvsphere-os.ru/msvsphere-8.xml            | 75 +++++++++++++++++
+ os/msvsphere-os.ru/msvsphere-9.xml            | 84 +++++++++++++++++++
+ 5 files changed, 257 insertions(+)
+ create mode 100644 os/msvsphere-os.ru/msvsphere-10.xml
+ create mode 100644 os/msvsphere-os.ru/msvsphere-8.xml
+ create mode 100644 os/msvsphere-os.ru/msvsphere-9.xml
+
+diff --git a/install-script/redhat.com/rhel-kickstart-desktop.xml b/install-script/redhat.com/rhel-kickstart-desktop.xml
+index 82911f4..7f3129b 100644
+--- a/install-script/redhat.com/rhel-kickstart-desktop.xml
++++ b/install-script/redhat.com/rhel-kickstart-desktop.xml
+@@ -179,6 +179,13 @@
+               <xsl:call-template name="arch"/>
+               <xsl:text>/BaseOS/os/</xsl:text>
+             </xsl:when>
++            <xsl:when test="os/distro = 'msvsphere'">
++              <xsl:text>https://repo1.msvsphere-os.ru/msvsphere/</xsl:text>
++              <xsl:call-template name="version"/>
++              <xsl:text>/BaseOS/</xsl:text>
++              <xsl:call-template name="arch"/>
++              <xsl:text>/os/</xsl:text>
++            </xsl:when>
+             <xsl:when test="os/distro = 'rocky'">
+               <xsl:text>https://download.rockylinux.org/pub/rocky/</xsl:text>
+               <xsl:call-template name="version"/>
+diff --git a/install-script/redhat.com/rhel-kickstart-jeos.xml b/install-script/redhat.com/rhel-kickstart-jeos.xml
+index 796f6cf..51c497f 100644
+--- a/install-script/redhat.com/rhel-kickstart-jeos.xml
++++ b/install-script/redhat.com/rhel-kickstart-jeos.xml
+@@ -159,6 +159,13 @@
+               <xsl:call-template name="arch"/>
+               <xsl:text>/BaseOS/os/</xsl:text>
+             </xsl:when>
++            <xsl:when test="os/distro = 'msvsphere'">
++              <xsl:text>https://repo1.msvsphere-os.ru/msvsphere/</xsl:text>
++              <xsl:call-template name="version"/>
++              <xsl:text>/BaseOS/</xsl:text>
++              <xsl:call-template name="arch"/>
++              <xsl:text>/os/</xsl:text>
++            </xsl:when>
+             <xsl:when test="os/distro = 'rocky'">
+               <xsl:text>https://download.rockylinux.org/pub/rocky/</xsl:text>
+               <xsl:call-template name="version"/>
+diff --git a/os/msvsphere-os.ru/msvsphere-10.xml b/os/msvsphere-os.ru/msvsphere-10.xml
+new file mode 100644
+index 0000000..81bacec
+--- /dev/null
++++ b/os/msvsphere-os.ru/msvsphere-10.xml
+@@ -0,0 +1,84 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++  <os id="http://msvsphere-os.ru/msvsphere/10">
++    <short-id>msvsphere10</short-id>
++    <name>MSVSphere 10</name>
++    <name xml:lang="cs">MSVSphere 10</name>
++    <name xml:lang="ka">MSVSphere 10</name>
++    <name xml:lang="fi">MSVSphere 10</name>
++    <name xml:lang="uk">MSVSphere 10</name>
++    <name xml:lang="tr">MSVSphere 10</name>
++    <name xml:lang="pt_BR">MSVSphere 10</name>
++    <name xml:lang="pl">MSVSphere 10</name>
++    <name xml:lang="it">MSVSphere 10</name>
++    <name xml:lang="id">MSVSphere 10</name>
++    <name xml:lang="de">MSVSphere 10</name>
++    <version>10</version>
++    <vendor>LLC "NCSD"</vendor>
++    <vendor xml:lang="cs">LLC "NCSD"</vendor>
++    <vendor xml:lang="ka">LLC "NCSD"</vendor>
++    <vendor xml:lang="ko">LLC "NCSD"</vendor>
++    <vendor xml:lang="uk">LLC "NCSD"</vendor>
++    <vendor xml:lang="tr">LLC "NCSD"</vendor>
++    <vendor xml:lang="pl">LLC "NCSD"</vendor>
++    <vendor xml:lang="it">LLC "NCSD"</vendor>
++    <vendor xml:lang="id">LLC "NCSD"</vendor>
++    <vendor xml:lang="de">LLC "NCSD"</vendor>
++    <family>linux</family>
++    <distro>msvsphere</distro>
++    <clones id="http://redhat.com/rhel/9.1"/>
++    <release-status>prerelease</release-status>
++    <media arch="x86_64">
++      <iso>
++        <volume-id>MSVSphere-10.*-x86_64.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <tree arch="x86_64">
++      <url>http://repo1.msvsphere-os.ru/msvsphere/10/BaseOS/x86_64/os/</url>
++      <treeinfo>
++        <family>MSVSphere</family>
++        <version>^10$</version>
++        <arch>x86_64</arch>
++      </treeinfo>
++    </tree>
++    <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="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>
++    <cloud-image-username>msvsphere</cloud-image-username>
++    <installer>
++      <script id="http://redhat.com/rhel/kickstart/jeos"/>
++      <script id="http://redhat.com/rhel/kickstart/desktop"/>
++    </installer>
++  </os>
++</libosinfo>
+diff --git a/os/msvsphere-os.ru/msvsphere-8.xml b/os/msvsphere-os.ru/msvsphere-8.xml
+new file mode 100644
+index 0000000..4a2a782
+--- /dev/null
++++ b/os/msvsphere-os.ru/msvsphere-8.xml
+@@ -0,0 +1,75 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++  <os id="http://msvsphere-os.ru/msvsphere/8">
++    <short-id>msvsphere8</short-id>
++    <name>MSVSphere 8</name>
++    <name xml:lang="cs">MSVSphere 8</name>
++    <name xml:lang="ka">MSVSphere 8</name>
++    <name xml:lang="fi">MSVSphere 8</name>
++    <name xml:lang="uk">MSVSphere 8</name>
++    <name xml:lang="tr">MSVSphere 8</name>
++    <name xml:lang="pt_BR">MSVSphere 8</name>
++    <name xml:lang="pl">MSVSphere 8</name>
++    <name xml:lang="it">MSVSphere 8</name>
++    <name xml:lang="id">MSVSphere 8</name>
++    <name xml:lang="de">MSVSphere 8</name>
++    <version>8</version>
++    <vendor>LLC "NCSD"</vendor>
++    <vendor xml:lang="cs">LLC "NCSD"</vendor>
++    <vendor xml:lang="ka">LLC "NCSD"</vendor>
++    <vendor xml:lang="ko">LLC "NCSD"</vendor>
++    <vendor xml:lang="uk">LLC "NCSD"</vendor>
++    <vendor xml:lang="tr">LLC "NCSD"</vendor>
++    <vendor xml:lang="pl">LLC "NCSD"</vendor>
++    <vendor xml:lang="it">LLC "NCSD"</vendor>
++    <vendor xml:lang="id">LLC "NCSD"</vendor>
++    <vendor xml:lang="de">LLC "NCSD"</vendor>
++    <family>linux</family>
++    <distro>msvsphere</distro>
++    <clones id="http://redhat.com/rhel/8.8"/>
++    <release-status>prerelease</release-status>
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>MSVSphere-8-*-x86_64-dvd.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <tree arch="x86_64">
++      <url>http://repo1.msvsphere-os.ru/msvsphere/8/BaseOS/x86_64/os/</url>
++      <treeinfo>
++        <family>MSVSphere</family>
++        <version>^8$</version>
++        <arch>x86_64</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="all">
++      <treeinfo>
++        <family>MSVSphere</family>
++        <version>^8$</version>
++      </treeinfo>
++    </tree>
++    <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>
++      <network-install>
++        <ram>3221225472</ram>
++      </network-install>
++    </resources>
++    <cloud-image-username>msvsphere</cloud-image-username>
++    <installer>
++      <script id="http://redhat.com/rhel/kickstart/jeos"/>
++      <script id="http://redhat.com/rhel/kickstart/desktop"/>
++    </installer>
++  </os>
++</libosinfo>
+diff --git a/os/msvsphere-os.ru/msvsphere-9.xml b/os/msvsphere-os.ru/msvsphere-9.xml
+new file mode 100644
+index 0000000..c930f2c
+--- /dev/null
++++ b/os/msvsphere-os.ru/msvsphere-9.xml
+@@ -0,0 +1,84 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++  <os id="http://msvsphere-os.ru/msvsphere/9">
++    <short-id>msvsphere9</short-id>
++    <name>MSVSphere 9</name>
++    <name xml:lang="cs">MSVSphere 9</name>
++    <name xml:lang="ka">MSVSphere 9</name>
++    <name xml:lang="fi">MSVSphere 9</name>
++    <name xml:lang="uk">MSVSphere 9</name>
++    <name xml:lang="tr">MSVSphere 9</name>
++    <name xml:lang="pt_BR">MSVSphere 9</name>
++    <name xml:lang="pl">MSVSphere 9</name>
++    <name xml:lang="it">MSVSphere 9</name>
++    <name xml:lang="id">MSVSphere 9</name>
++    <name xml:lang="de">MSVSphere 9</name>
++    <version>9</version>
++    <vendor>LLC "NCSD"</vendor>
++    <vendor xml:lang="cs">LLC "NCSD"</vendor>
++    <vendor xml:lang="ka">LLC "NCSD"</vendor>
++    <vendor xml:lang="ko">LLC "NCSD"</vendor>
++    <vendor xml:lang="uk">LLC "NCSD"</vendor>
++    <vendor xml:lang="tr">LLC "NCSD"</vendor>
++    <vendor xml:lang="pl">LLC "NCSD"</vendor>
++    <vendor xml:lang="it">LLC "NCSD"</vendor>
++    <vendor xml:lang="id">LLC "NCSD"</vendor>
++    <vendor xml:lang="de">LLC "NCSD"</vendor>
++    <family>linux</family>
++    <distro>msvsphere</distro>
++    <clones id="http://redhat.com/rhel/9.1"/>
++    <release-status>prerelease</release-status>
++    <media arch="x86_64">
++      <iso>
++        <volume-id>MSVSphere-9.*-x86_64.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <tree arch="x86_64">
++      <url>http://repo1.msvsphere-os.ru/msvsphere/9/BaseOS/x86_64/os/</url>
++      <treeinfo>
++        <family>MSVSphere</family>
++        <version>^9$</version>
++        <arch>x86_64</arch>
++      </treeinfo>
++    </tree>
++    <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="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>
++    <cloud-image-username>msvsphere</cloud-image-username>
++    <installer>
++      <script id="http://redhat.com/rhel/kickstart/jeos"/>
++      <script id="http://redhat.com/rhel/kickstart/desktop"/>
++    </installer>
++  </os>
++</libosinfo>
+-- 
+2.43.5
+
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 30c286b..2200189 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -18,11 +18,14 @@
 Summary: osinfo database files
 Name: osinfo-db
 Version: 20240701
-Release: %autorelease
+Release: %autorelease.inferit
 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/
+# MSVSphere
+Patch1001: 0001-Added-MSVSphere-support.patch
+
 BuildRequires: intltool
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
@@ -55,8 +58,12 @@ operating systems for use with virtualization provisioning tools
 
 %endif
 
+%prep
+%autosetup -p1 -S git_am
+
 %install
-osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+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 {} +
@@ -103,6 +110,9 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
 %endif
 
 %changelog
+* Fri Jan 24 2025 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 20240701-1.inferit
+- Added MSVSphere support
+
 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 20240701-1
 - Rebuilt for MSVSphere 10