Resolved conflict in SPECS/osinfo-db.spec

pull/4/head
ebasov 2 months ago
commit 08fd52dc3d
Signed by: ebasov
GPG Key ID: 3DE9E7A44B2D38F6

@ -3,7 +3,8 @@
Summary: osinfo database files Summary: osinfo database files
Name: osinfo-db Name: osinfo-db
Version: 20240701 Version: 20240701
Release: 2%{?dist}.inferit.1 Release: 2%{?dist}.inferit
>>>>>>> upstream/i9-beta
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
@ -42,9 +43,7 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
%{_datadir}/osinfo/schema %{_datadir}/osinfo/schema
%changelog %changelog
* Tue Nov 12 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-2.inferit.1 >>>>>>> upstream/i9-beta
- Fix .patch and add aarch64
* Wed Oct 16 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-2.inferit * Wed Oct 16 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 20240701-2.inferit
- Added MSVSphere support - Added MSVSphere support

Loading…
Cancel
Save