From e6d96e8c86ecc9b661ea5c1ef4e0e8b07afab531 Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 12 Nov 2024 16:04:44 +0300 Subject: [PATCH] Fix .spec second try --- SPECS/osinfo-db.spec | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index b95abba..e49f575 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -3,12 +3,12 @@ Summary: osinfo database files Name: osinfo-db Version: 20240701 -Release: 1%{?dist}.inferit.1 +Release: 2%{?dist}.inferit.1 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 +Patch0001: 0001-Added-MSVSphere-support.patch URL: http://libosinfo.org/ -Patch0002: 0001-Added-MSVSphere-support.patch BuildRequires: intltool BuildRequires: git-core BuildRequires: osinfo-db-tools @@ -24,9 +24,7 @@ provisioning of new virtual machines %autosetup -S git_am %install -#repack -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 +osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0} %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 {} + @@ -44,27 +42,24 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - %{_datadir}/osinfo/schema %changelog -* Tue Nov 12 2024 Eduard Basov - 20240701-1.inferit.1 -- Fix .patch and add aarch64 +* Tue Nov 12 2024 Eduard Basov - 20240701-2.inferit.1 +- Fix .patch and add aarch64 -* Wed Oct 16 2024 Eduard Basov - 20240701-1.inferit -- Fix applying patch for MSVSphere support -- Update to new release (v20240701) - -* Wed Oct 16 2024 Eduard Basov - 20231215-1.inferit -- Fix applying patch for MSVSphere support -- Update to new release (v20231215) +* Wed Oct 16 2024 Eduard Basov - 20240701-2.inferit +- Added MSVSphere support -* 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 +* Fri Aug 02 2024 Victor Toso - 20240701-2 +- Fix changelog + Related: rhbz#RHEL-52519 -* Wed Sep 13 2023 Arkady L. Shane - 20221130-1.inferit.1 -- Change urls from msvsphere.ru to msvsphere-os.ru +* Fri Aug 02 2024 Victor Toso - 20240701-1 +- Update to new release (v20240701) + Resolves: rhbz#RHEL-52519 + Resolves: rhbz#RHEL-38636 -* Thu Aug 24 2023 Arkady L. Shane - 20221130-1.inferit -- Added MSVSphere support +* Tue Jan 02 2024 Victor Toso - 20231215-1 +- Update to new release (v20231215) + Resolves: rhbz#RHEL-19756 * Tue May 23 2023 Victor Toso - 20230518-1 - Update to new release (v20230518) @@ -73,9 +68,6 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d - * Fri Apr 14 2023 MSVSphere Packaging Team - 20221130-1 - Rebuilt for MSVSphere 9.2 beta -* Wed Mar 15 2023 MSVSphere Packaging Team - 20220727-3 -- Rebuilt for MSVSphere 9.1. - * Wed Nov 30 2022 Victor Toso - 20221130-1 - Update for new release (v20221130) Resolves: rhbz#2135751