Merge tag 'changed/i9c-beta/osinfo-db-20230518-1.el9' into i9-beta

pull/2/head
Alexey Lyubimov 1 year ago
commit 6498b5d630

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

@ -0,0 +1,16 @@
-----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-----

@ -1,17 +1,13 @@
# -*- rpm-spec -*- # -*- rpm-spec -*-
%define PatchedSource ../%{name}-%{version}-patched.tar.xz
%define ExtractedSource %{name}-%{version}
Summary: osinfo database files Summary: osinfo database files
Name: osinfo-db Name: osinfo-db
Version: 20221130 Version: 20230518
Release: 1%{?dist}.inferit.1 Release: 1%{?dist}.inferit
License: LGPLv2+ License: LGPLv2+
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz 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 Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
URL: http://libosinfo.org/ URL: http://libosinfo.org/
Patch0001: 0001-Add-prereleases-rhel-8.8-and-rhel-9.2.patch
Patch0002: 0001-Added-MSVSphere-support.patch Patch0002: 0001-Added-MSVSphere-support.patch
BuildRequires: intltool BuildRequires: intltool
BuildRequires: git-core BuildRequires: git-core
@ -27,12 +23,8 @@ provisioning of new virtual machines
%prep %prep
%autosetup -S git_am %autosetup -S git_am
%build
rm -rf ../%{ExtractedSource}/.git
tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
%install %install
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource} osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
%if 0%{?rhel} %if 0%{?rhel}
# Remove the upstream virtio-win / spice-guest-tools drivers # Remove the upstream virtio-win / spice-guest-tools drivers
find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} + find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
@ -56,6 +48,13 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
* Thu Aug 24 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 20221130-1.inferit * Thu Aug 24 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 20221130-1.inferit
- Added MSVSphere support - 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 * Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 20220727-3
- Rebuilt for MSVSphere 9.1. - Rebuilt for MSVSphere 9.1.

Loading…
Cancel
Save