diff --git a/.gitignore b/.gitignore index 340937c..a3cd05d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osinfo-db-20230518.tar.xz +SOURCES/osinfo-db-20231215.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata index e55f907..4a064fe 100644 --- a/.osinfo-db.metadata +++ b/.osinfo-db.metadata @@ -1 +1 @@ -3bcd3e87c3f58bf4a62e2c75644c063a82462823 SOURCES/osinfo-db-20230518.tar.xz +ad1464b0d179d74a987f653857d8c78a6549e2f6 SOURCES/osinfo-db-20231215.tar.xz diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch index b958468..6b4c535 100644 --- a/SOURCES/0001-Added-MSVSphere-support.patch +++ b/SOURCES/0001-Added-MSVSphere-support.patch @@ -22,7 +22,7 @@ index 82911f4..315b475 100644 /BaseOS/os/ + -+ https://rsync.inferitos.ru/msvsphere/ ++ https://repo1.msvsphere-os.ru/msvsphere/ + + /BaseOS/ + @@ -40,7 +40,7 @@ index 21d3e85..295a006 100644 /BaseOS/os/ + -+ https://rsync.inferitos.ru/msvsphere/ ++ https://repo1.msvsphere-os.ru/msvsphere/ + + /BaseOS/ + @@ -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 @@ + + + @@ -88,13 +88,13 @@ index 0000000..e5cb57b + + + LINUX -+ MSVSphere-8-([3-9]|[1-9][0-9])-x86_64-dvd.* ++ MSVSphere-8-*-x86_64-dvd.* + + isolinux/vmlinuz + isolinux/initrd.img + + -+ http://rsync.inferitos.ru/msvsphere/8/BaseOS/x86_64/os/ ++ http://repo1.msvsphere-os.ru/msvsphere/8/BaseOS/x86_64/os/ + + MSVSphere + ^8$ @@ -107,9 +107,6 @@ index 0000000..e5cb57b + ^8$ + + -+ -+ https://rsync.inferitos.ru/msvsphere/8/images/MSVSphere-8.8-2023xxxx.gencloud.x86_64.qcow2 -+ + + + 1 @@ -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 @@ + + + @@ -177,16 +174,13 @@ index 0000000..05dc550 + isolinux/initrd.img + + -+ http://rsync.inferitos.ru/msvsphere/9/BaseOS/x86_64/os/ ++ http://repo1.msvsphere-os.ru/msvsphere/9/BaseOS/x86_64/os/ + + MSVSphere + ^9$ + x86_64 + + -+ -+ https://rsync.inferitos.ru/msvsphere/9/images/MSVSphere-9.2-20230708.gencloud.x86_64.qcow2 -+ + + + 1000000000 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-20231215.tar.xz.asc b/SOURCES/osinfo-db-20231215.tar.xz.asc new file mode 100644 index 0000000..da328f4 --- /dev/null +++ b/SOURCES/osinfo-db-20231215.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmV8aCcACgkQl9kSPeN6 +SE/Wjw//WjeiRGVlXa317HAyltKFMUK2EDlGoyxTyY5WCUpKzuZBcgCJCaND1xER +R4HbksjI20wSI8U4Mkt9S7+aLaA4ulea08+jQSrT7UPh6mBL3uvFMcAeUzC0o2wi +yq7XSsOAWK7eac713GRqIo3wi94yXDS22CXFmY2VAgWGXfK+klHonbuE01x5sSxr +26qzRThaNsVNa2pk43rFSsAiIZ/aoTa/CH91eiZU1ESxNFelEcEv3AjWYC6iStQc +nhjWPO8LycEQVCVxNLHllyK/YJyZSkWHyZf7CMc2D9TzjTWz13hgV5ATvsCjRYaQ +OFEagRaTlUxlFawzDp7r3MiOvuvQ7Q4Ylj3cNd4OzQdT7psR1Mdc8BEi6MUr4BEM +ZZmEemKYjrbk4lkMFPyRLf15ZOcPB3OkjUeG6yRwcRuzO24z/Dtpz6B+0xmNTbbO +yJ2BX96o/7ter5RaEyzG/zv7EXamgRHurTaG5lHZ1CVRNEA4WoKQOzn58U6MNQqs +iSlh2Ue6booD+bQORWzfaKCb/REvzSUBzcEPR2ObooTLxdLA63l8Ti7oTeFVLg92 +J4of6MnXKXy+QVzkH8qhnOnR5EG4cw0rdsP5VM5O4vMFRgUyi2UiypPKqYKyLqjV +SmxKmsZEH93gC0bhitXqUbmzg+vDPhahVUvKK3oJr284YciXJ4M= +=oQvF +-----END PGP SIGNATURE----- diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 7f0508a..71e9fbc 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: 20231215 +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 - 20230518-1.inferit.1 +* Wed Oct 16 2024 Eduard Basov - 20231215-1.inferit +- Fix applying patch for MSVSphere support +- Update to new release (v20231215) + +* Mon Dec 4 2023 Arkady L. Shane - 20230518-1.inferit.1 - Fix applying patch for MSVSphere support - Update to new release (v20230518) Resolves: rhbz#2184784