From 4a1f0aac73456754133d6b9b92a3d4848b3954ec Mon Sep 17 00:00:00 2001
From: ebasov <eduard.basov@softline.com>
Date: Thu, 17 Oct 2024 00:17:19 +0300
Subject: [PATCH] Patch changes and adding a new version of tarball

---
 .gitignore                                 |  2 +-
 .osinfo-db.metadata                        |  2 +-
 SOURCES/0001-Added-MSVSphere-support.patch | 24 ++++++++--------------
 SOURCES/osinfo-db-20230518.tar.xz.asc      | 16 ---------------
 SOURCES/osinfo-db-20240701.tar.xz.asc      | 16 +++++++++++++++
 SPECS/osinfo-db.spec                       | 10 ++++++---
 6 files changed, 34 insertions(+), 36 deletions(-)
 delete mode 100644 SOURCES/osinfo-db-20230518.tar.xz.asc
 create mode 100644 SOURCES/osinfo-db-20240701.tar.xz.asc

diff --git a/.gitignore b/.gitignore
index 340937c..e94c36f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20230518.tar.xz
+SOURCES/osinfo-db-20240701.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index e55f907..1768219 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-3bcd3e87c3f58bf4a62e2c75644c063a82462823 SOURCES/osinfo-db-20230518.tar.xz
+43b0f08a371095c22285e4cbe550cafaa5decd2e  SOURCES/osinfo-db-20240701.tar.xz
diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch
index b958468..e684f8a 100644
--- a/SOURCES/0001-Added-MSVSphere-support.patch
+++ b/SOURCES/0001-Added-MSVSphere-support.patch
@@ -54,7 +54,7 @@ new file mode 100644
 index 0000000..e5cb57b
 --- /dev/null
 +++ b/os/msvsphere-os.ru/msvsphere-8.xml
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,75 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<libosinfo version="0.0.1">
 +  <os id="http://msvsphere-os.ru/msvsphere/8">
@@ -88,13 +88,13 @@ index 0000000..e5cb57b
 +    <media arch="x86_64">
 +      <iso>
 +        <system-id>LINUX</system-id>
-+        <volume-id>MSVSphere-8-([3-9]|[1-9][0-9])-x86_64-dvd.*</volume-id>
++        <volume-id>MSVSphere-8.*.x86_64.*</volume-id>
 +      </iso>
 +      <kernel>isolinux/vmlinuz</kernel>
 +      <initrd>isolinux/initrd.img</initrd>
 +    </media>
 +    <tree arch="x86_64">
-+      <url>http://rsync.inferitos.ru/msvsphere/8/BaseOS/x86_64/os/</url>
++      <url>http://repo1.msvsphre-os.ru/msvsphere/8/BaseOS/x86_64/os/</url>
 +      <treeinfo>
 +        <family>MSVSphere</family>
 +        <version>^8$</version>
@@ -107,28 +107,25 @@ index 0000000..e5cb57b
 +        <version>^8$</version>
 +      </treeinfo>
 +    </tree>
-+    <image arch="x86_64" format="qcow2" cloud-init="true">
-+      <url>https://rsync.inferitos.ru/msvsphere/8/images/MSVSphere-8.8-2023xxxx.gencloud.x86_64.qcow2</url>
-+    </image>
 +    <resources arch="all">
 +      <minimum>
 +        <n-cpus>1</n-cpus>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
-+        <storage>10737418240</storage>
++       <storage>10737418240</storage>
 +      </minimum>
 +      <recommended>
 +        <cpu>1000000000</cpu>
 +        <ram>1610612736</ram>
 +        <storage>21474836480</storage>
-+      </recommended>
++     </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/jeos"/>
 +      <script id="http://redhat.com/rhel/kickstart/desktop"/>
 +    </installer>
 +  </os>
@@ -138,7 +135,7 @@ new file mode 100644
 index 0000000..05dc550
 --- /dev/null
 +++ b/os/msvsphere-os.ru/msvsphere-9.xml
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,84 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<libosinfo version="0.0.1">
 +  <os id="http://msvsphere-os.ru/msvsphere/9">
@@ -171,22 +168,19 @@ index 0000000..05dc550
 +    <release-status>prerelease</release-status>
 +    <media arch="x86_64">
 +      <iso>
-+        <volume-id>MSVSphere-9.*-x86_64.*</volume-id>
++        <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://rsync.inferitos.ru/msvsphere/9/BaseOS/x86_64/os/</url>
++      <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>
-+    <image arch="x86_64" format="qcow2" cloud-init="true">
-+      <url>https://rsync.inferitos.ru/msvsphere/9/images/MSVSphere-9.2-20230708.gencloud.x86_64.qcow2</url>
-+    </image>
 +    <resources arch="x86_64">
 +      <minimum>
 +        <cpu>1000000000</cpu>
diff --git a/SOURCES/osinfo-db-20230518.tar.xz.asc b/SOURCES/osinfo-db-20230518.tar.xz.asc
deleted file mode 100644
index 38344b5..0000000
--- a/SOURCES/osinfo-db-20230518.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmRmJYwACgkQl9kSPeN6
-SE/AqA/+JhUFgVcGDaZ1c7/XBbLFN3QPhtKJd8A30YH2Xxd5/GEuKsnYUrAGpIe6
-oM3X+08cY2OEJSlb6zShV7NsqQtGcbgCmG4s01UJFC1lKSRWRQJlj7a48Ujo+Sd3
-dJafRY6AboOYNP0rVUqxsJX4Bgy26DmX/K+q8nZaZwS+nEPQ4XS1WY8l7g+sbGDb
-IAflmpp2CGn7ofp68JCAGt1IJfdCQVece6rPitxdRp+SLIfTkeiHWW6sG9oPPoNW
-9Lu4Dtk4DfnatgcDQQLvbA033q6SqZ46td9L0fnGDUQFn+oEh9+v6AR5cMWlWG47
-IHhDzFlkRUVXpz+AbfSCjssHkF3Xh7pLjpH/KVvyOZVZzeASRYXNXyRgemUZXw1U
-U2T1WjINDQHUkkNwa+ORcF+p3u41Nn8vDRYf07HQPpW10qqCbHs50hxsSnV9Vgll
-BfDC4IQ6sP7oEfIdNAYIpRjeO0FaL8g7R/Z4y48cfv1jbvgIL7WJQLSXjn82PhKI
-URLAh47kxv4n6OBX3i/F8HTz5x3sAsNlLKVasHVyAoMSMneCT/CBdD7FUfExb7Ig
-m+uVZ6pFQoX/lHlmXvcTYlP3o931o6ta4BxSsO1X0nwk9PBQxDDtyF7euwERBfKm
-VzsT70zk3ViZZ3SxEZf5G13VKI/V6cIVqAu7tTOtVAj/FX5EWX0=
-=yhtU
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20240701.tar.xz.asc b/SOURCES/osinfo-db-20240701.tar.xz.asc
new file mode 100644
index 0000000..79bcf5c
--- /dev/null
+++ b/SOURCES/osinfo-db-20240701.tar.xz.asc
@@ -0,0 +1,16 @@
+-----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/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 7f0508a..aff54b4 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -2,8 +2,8 @@
 
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20230518
-Release: 1%{?dist}.inferit.1
+Version: 20240701
+Release: 1%{?dist}.inferit
 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
@@ -44,7 +44,11 @@ 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
+* Wed Oct 16 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-1.inferit
+- Fix applying patch for MSVSphere support
+- Update to new release (v20240701)
+
+* 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