rpms/osbuild
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
eabdullin 2025-05-23 13:13:52 +00:00
parent c577d4ea4e
commit cd074f26af
1 changed files with 54 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
SPECS/osbuild.spec
View File

@ -1,7 +1,7 @@
%global forgeurl https://github.com/osbuild/osbuild
%global selinuxtype targeted
Version: 141.2
Version: 141.2
%forgemeta
@ -9,41 +9,40 @@ Version: 141.2
%global pkgdir %{_prefix}/lib/%{pypi_name}
Name: %{pypi_name}
Release: 1.0.1%{?dist}
Release: 1%{?dist}
License: Apache-2.0
URL: %{forgeurl}
URL: %{forgeurl}
Source0: %{forgesource}
BuildArch: noarch
Summary: A build system for OS images
Source0: %{forgesource}
BuildArch: noarch
Summary: A build system for OS images
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: python3-docutils
BuildRequires: systemd
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: python3-docutils
BuildRequires: systemd
Requires: bash
Requires: bubblewrap
Requires: coreutils
Requires: curl
Requires: e2fsprogs
Requires: glibc
Requires: policycoreutils
Requires: qemu-img
Requires: systemd
Requires: skopeo
Requires: tar
Requires: util-linux
Requires: python3-%{pypi_name} = %{version}-%{release}
Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
Requires: python3-librepo
Requires: bash
Requires: bubblewrap
Requires: coreutils
Requires: curl
Requires: e2fsprogs
Requires: glibc
Requires: policycoreutils
Requires: qemu-img
Requires: systemd
Requires: skopeo
Requires: tar
Requires: util-linux
Requires: python3-%{pypi_name} = %{version}-%{release}
Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
Requires: python3-librepo
# This is required for `osbuild`, for RHEL-10 and above
# the stdlib toml package can be used instead
%if 0%{?rhel} < 10
Requires: python3-tomli
Requires: python3-tomli
%endif
# Turn off dependency generators for runners. The reason is that runners are
@ -71,46 +70,46 @@ Requires: python3-tomli
A build system for OS images
%package -n python3-%{pypi_name}
Summary: %{summary}
Summary: %{summary}
%{?python_provide:%python_provide python3-%{pypi_name}}
%description -n python3-%{pypi_name}
A build system for OS images
%package lvm2
Summary: LVM2 support
Requires: %{name} = %{version}-%{release}
Requires: lvm2
Summary: LVM2 support
Requires: %{name} = %{version}-%{release}
Requires: lvm2
%description lvm2
Contains the necessary stages and device host
services to build LVM2 based images.
%package luks2
Summary: LUKS2 support
Requires: %{name} = %{version}-%{release}
Requires: cryptsetup
Summary: LUKS2 support
Requires: %{name} = %{version}-%{release}
Requires: cryptsetup
%description luks2
Contains the necessary stages and device host
services to build LUKS2 encrypted images.
%package ostree
Summary: OSTree support
Requires: %{name} = %{version}-%{release}
Requires: ostree
Requires: rpm-ostree
Summary: OSTree support
Requires: %{name} = %{version}-%{release}
Requires: ostree
Requires: rpm-ostree
%description ostree
Contains the necessary stages, assembler and source
to build OSTree based images.
%package selinux
Summary: SELinux policies
Requires: %{name} = %{version}-%{release}
Requires: selinux-policy-%{selinuxtype}
Summary: SELinux policies
Requires: %{name} = %{version}-%{release}
Requires: selinux-policy-%{selinuxtype}
Requires(post): selinux-policy-%{selinuxtype}
BuildRequires: selinux-policy-devel
BuildRequires: selinux-policy-devel
%{?selinux_requires}
%description selinux
@ -119,16 +118,16 @@ osbuild to use labels unknown to the host inside the
containers it uses to build OS artifacts.
%package tools
Summary: Extra tools and utilities
Requires: %{name} = %{version}-%{release}
Requires: python3-pyyaml
Requires: python3-dnf
Summary: Extra tools and utilities
Requires: %{name} = %{version}-%{release}
Requires: python3-pyyaml
Requires: python3-dnf
# These are required for `osbuild-dev`, only packaged for Fedora
%if 0%{?fedora}
Requires: python3-rich
Requires: python3-attrs
Requires: python3-typer
Requires: python3-rich
Requires: python3-attrs
Requires: python3-typer
%endif
%description tools
@ -136,27 +135,27 @@ Contains additional tools and utilities for development of
manifests and osbuild.
%package depsolve-dnf
Summary: Dependency solving support for DNF
Requires: %{name} = %{version}-%{release}
Summary: Dependency solving support for DNF
Requires: %{name} = %{version}-%{release}
# RHEL 11 and Fedora 41 and later use libdnf5, RHEL < 11 and Fedora < 41 use dnf
# On Fedora 41 however, we force dnf4 (and depend on python3-dnf) until dnf5 issues are resolved.
# See https://github.com/rpm-software-management/dnf5/issues/1748
# and https://issues.redhat.com/browse/COMPOSER-2361
%if 0%{?rhel} >= 11
Requires: python3-libdnf5 >= 5.2.1
Requires: python3-libdnf5 >= 5.2.1
%else
Requires: python3-dnf
Requires: python3-dnf
%endif
# osbuild 125 added a new "solver" field and osbuild-composer only
# supports this since 116
Conflicts: osbuild-composer <= 115
Conflicts: osbuild-composer <= 115
# This version needs to get bumped every time the osbuild-dnf-json
# version changes in an incompatible way. Packages like osbuild-composer
# can depend on the exact API version this way
Provides: osbuild-dnf-json-api = 8
Provides: osbuild-dnf-json-api = 8
%description depsolve-dnf
Contains depsolving capabilities for package managers.
@ -164,8 +163,6 @@ Contains depsolving capabilities for package managers.
%prep
%forgeautosetup -p1
ln -rsf %{_builddir}/%{name}-%{version}/runners/org.osbuild.centos9 %{_builddir}/%{name}-%{version}/runners/org.osbuild.ol
%build
%py3_build
make man
@ -321,12 +318,6 @@ fi
%{pkgdir}/solver.json
%changelog
* Mon May 19 2025 Craig Guiller <craig.guiller@oracle.com> - 141.2-1.0.1
- Add runner for ol8 and ol9 [Orabug: 36400619]
* Tue May 13 2025 Release Engineering <releng@openela.org> - 141.2.openela.0.2
- Add OpenELA runners
* Wed Apr 02 2025 Tomáš Hozza <thozza@redhat.com> - 141.2-1
- Resolve RHEL-85560