Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
 Andrew Lukoshko
|
e93ec9f6ce |
|
|
@ -1 +1 @@
|
|||
SOURCES/osinfo-db-20231215.tar.xz
|
||||
SOURCES/osinfo-db-20210215.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
eb65b68e69b1955167d30ff6c9a213affde78418 SOURCES/osinfo-db-20210215.tar.xz
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
diff -Naur osinfo-db-20200813.orig/install-script/redhat.com/rhel-kickstart-desktop.xml osinfo-db-20200813.alma/install-script/redhat.com/rhel-kickstart-desktop.xml
|
||||
--- osinfo-db-20200813.orig/install-script/redhat.com/rhel-kickstart-desktop.xml 2020-08-13 13:44:02.000000000 +0300
|
||||
+++ osinfo-db-20200813.alma/install-script/redhat.com/rhel-kickstart-desktop.xml 2021-03-13 14:03:32.081390444 +0300
|
||||
@@ -158,6 +158,13 @@
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
+ <xsl:when test="os/distro = 'almalinux'">
|
||||
+ <xsl:text>http://repo.almalinux.org/almalinux/</xsl:text>
|
||||
+ <xsl:call-template name="version"/>
|
||||
+ <xsl:text>/BaseOS/</xsl:text>
|
||||
+ <xsl:call-template name="arch"/>
|
||||
+ <xsl:text>/os/</xsl:text>
|
||||
+ </xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
<xsl:template name="appstream-url">
|
||||
diff -Naur osinfo-db-20200813.orig/install-script/redhat.com/rhel-kickstart-jeos.xml osinfo-db-20200813.alma/install-script/redhat.com/rhel-kickstart-jeos.xml
|
||||
--- osinfo-db-20200813.orig/install-script/redhat.com/rhel-kickstart-jeos.xml 2020-08-13 13:44:02.000000000 +0300
|
||||
+++ osinfo-db-20200813.alma/install-script/redhat.com/rhel-kickstart-jeos.xml 2021-03-13 14:04:23.528039336 +0300
|
||||
@@ -138,6 +138,13 @@
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
+ <xsl:when test="os/distro = 'almalinux'">
|
||||
+ <xsl:text>http://repo.almalinux.org/almalinux/</xsl:text>
|
||||
+ <xsl:call-template name="version"/>
|
||||
+ <xsl:text>/BaseOS/</xsl:text>
|
||||
+ <xsl:call-template name="arch"/>
|
||||
+ <xsl:text>/os/</xsl:text>
|
||||
+ </xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
<xsl:template match="/install-script-config">
|
||||
diff -Naur osinfo-db-20200813.orig/os/almalinux.org/almalinux-8.xml osinfo-db-20200813.alma/os/almalinux.org/almalinux-8.xml
|
||||
--- osinfo-db-20200813.orig/os/almalinux.org/almalinux-8.xml 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ osinfo-db-20200813.alma/os/almalinux.org/almalinux-8.xml 2021-03-13 16:06:46.622017282 +0300
|
||||
@@ -0,0 +1,56 @@
|
||||
+<?xml version="1.0"?>
|
||||
+<libosinfo version="0.0.1">
|
||||
+ <os id="http://almalinux.org/almalinux/8">
|
||||
+ <short-id>almalinux8</short-id>
|
||||
+ <name>AlmaLinux 8</name>
|
||||
+ <version>8</version>
|
||||
+ <vendor>AlmaLinux</vendor>
|
||||
+ <family>linux</family>
|
||||
+ <distro>almalinux</distro>
|
||||
+ <codename>Purple Manul</codename>
|
||||
+ <clones id="http://redhat.com/rhel/8.3"/>
|
||||
+ <release-date>2021-03-30</release-date>
|
||||
+ <media arch="x86_64">
|
||||
+ <iso>
|
||||
+ <system-id>LINUX</system-id>
|
||||
+ <volume-id>AlmaLinux-8.*-x86_64.*</volume-id>
|
||||
+ </iso>
|
||||
+ <kernel>isolinux/vmlinuz</kernel>
|
||||
+ <initrd>isolinux/initrd.img</initrd>
|
||||
+ </media>
|
||||
+ <tree arch="x86_64">
|
||||
+ <url>http://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/</url>
|
||||
+ <treeinfo>
|
||||
+ <family>AlmaLinux</family>
|
||||
+ <version>^8$</version>
|
||||
+ <arch>x86_64</arch>
|
||||
+ </treeinfo>
|
||||
+ </tree>
|
||||
+ <tree arch="all">
|
||||
+ <treeinfo>
|
||||
+ <family>AlmaLinux</family>
|
||||
+ <version>^8$</version>
|
||||
+ </treeinfo>
|
||||
+ </tree>
|
||||
+ <resources arch="all">
|
||||
+ <minimum>
|
||||
+ <n-cpus>1</n-cpus>
|
||||
+ <cpu>1000000000</cpu>
|
||||
+ <ram>1610612736</ram>
|
||||
+ <storage>10737418240</storage>
|
||||
+ </minimum>
|
||||
+ <recommended>
|
||||
+ <cpu>1000000000</cpu>
|
||||
+ <ram>1610612736</ram>
|
||||
+ <storage>21474836480</storage>
|
||||
+ </recommended>
|
||||
+ <network-install>
|
||||
+ <ram>3221225472</ram>
|
||||
+ </network-install>
|
||||
+ </resources>
|
||||
+ <installer>
|
||||
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
|
||||
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
|
||||
+ </installer>
|
||||
+ </os>
|
||||
+</libosinfo>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAmAqUSwACgkQ7pJsK9rM
|
||||
F3v2DBAAxIotcbyCjulyMUnCFnqwH8M6ogKA44OygwndimIRDfvZBcscRNR4DuMJ
|
||||
kf6x0L6uWwGfOtORaYtZ40wtrPWp/UoYdM134SlyETa70lp4f2mO1CBWVO4j4i7d
|
||||
Iw7p2ZqYWF4l8n7LiLzVUWyBVTi4e5NyJT6Y4UTmDjB/0luW6M9w3SKEmHIeTKDn
|
||||
CqW9kXoOOTX9fxybsxnRZzxMZaPR4NIybUB8I+XAzDLjPfsGXuQzlUKtjstPqF9O
|
||||
2HSNB17RNLubO9UOa7oEq5NWsLJ/q/oHTaWgGfvqCQJQjK3UtmP+Zz5DZYqSFi/1
|
||||
X+xr8j1Pe+QNTYMmUFyCXIcXGAMffLbAB4YGxDOum4Yy355paa+rM4RgQSo6ZgAv
|
||||
ESCo4opAGamh5bzruNLzDX9fKSLezo/NQ3r2voJkld4xKx1CC+mws/cZWuFewSrz
|
||||
vy2KVv20R2J2eUUMvgNCAOun8GFwwd3a/Pem6KnXfjn3CsJIH4xnq11KI13RKBz/
|
||||
96grCUwmw9Tq2CQRsu7DEVuG+RsoOXIOiY1Y9Ktj1M7tDkSfvIRqhV7CIQmVh68L
|
||||
8grURI97zOXMinlAUt9+gB3cwia1HseqtFqNkk6hLs53y1mo7Huothzt6S67ZnZI
|
||||
w8dpmDFuOWm6H1PBojvvs5tVJvyc0dGOASsMWZHZQK8oyvEMzaI=
|
||||
=AFN6
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
-----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-----
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
# -*- rpm-spec -*-
|
||||
|
||||
%define PatchedSource ../%{name}-%{version}-patched.tar.xz
|
||||
|
||||
Summary: osinfo database files
|
||||
Name: osinfo-db
|
||||
Version: 20231215
|
||||
Release: 1%{?dist}
|
||||
Version: 20210215
|
||||
Release: 1%{?dist}.alma
|
||||
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
|
||||
Patch0: osinfo-db-20200813-add_almalinux.patch
|
||||
URL: http://libosinfo.org/
|
||||
BuildRequires: intltool
|
||||
BuildRequires: git-core
|
||||
BuildRequires: osinfo-db-tools
|
||||
BuildArch: noarch
|
||||
Requires: hwdata
|
||||
|
|
@ -20,10 +22,22 @@ hypervisor platforms to facilitate the automated configuration and
|
|||
provisioning of new virtual machines
|
||||
|
||||
%prep
|
||||
%autosetup -S git_am
|
||||
%setup
|
||||
%patch0 -p1
|
||||
|
||||
# Remove spurious leftovers from when applying the patches
|
||||
find ../%{name}-%{version}/ -name "*.orig" -exec rm -f {} \;
|
||||
|
||||
# For us to be able to apply patches on top of a rebase, we:
|
||||
# 1. unpack the sources
|
||||
# 2. patch the sources
|
||||
# 3. pack the sources in a tarball
|
||||
# 4. feed the patched tarball to osinfo-db-import
|
||||
%build
|
||||
tar -cvJf %{PatchedSource} ../%{name}-%{version}/
|
||||
|
||||
%install
|
||||
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
|
||||
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
|
||||
%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 {} +
|
||||
|
|
@ -41,33 +55,8 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
|
|||
%{_datadir}/osinfo/schema
|
||||
|
||||
%changelog
|
||||
* Tue Jan 02 2024 Victor Toso <victortoso@redhat.com> - 20231215-1
|
||||
- Update to new release (v20231215)
|
||||
Resolves: rhbz#RHEL-19757
|
||||
|
||||
* Tue May 23 2023 Victor Toso <victortoso@redhat.com> - 20230518-1
|
||||
- Update to new release (v20230518)
|
||||
Resolves: rhbz#2184782
|
||||
Resolves: rhbz#2184613
|
||||
|
||||
* Tue Aug 02 2022 Victor Toso <victortoso@redhat.com> - 20220727-2
|
||||
- Add prereleases: rhel-8.7 and rhel-9.1
|
||||
Resolves: rhbz#2103908
|
||||
|
||||
* Thu Jul 28 2022 Victor Toso <victortoso@redhat.com> - 20220727-1
|
||||
- Update to new release (v20220727)
|
||||
Resolves: rhbz#2083663
|
||||
|
||||
* Tue May 17 2022 Victor Toso <victortoso@redhat.com> - 20220516-1
|
||||
- Update to new release (v20220516)
|
||||
Resolves: rhbz#2083663
|
||||
|
||||
* Thu Dec 16 2021 Victor Toso <victortoso@redhat.com> - 20211216-1
|
||||
- Update to new release (v20211216)
|
||||
Resolves: rhbz#1976818
|
||||
|
||||
* Mon Aug 09 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210809-1
|
||||
- Update to new release (v20210806)
|
||||
* Mon Apr 19 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 20210215-1.alma
|
||||
- Add AlmaLinux 8 detection
|
||||
|
||||
* Mon Feb 15 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210215-1
|
||||
- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
|
||||
|
|
|
|||
Loading…
Reference in New Issue