rpms/osbuild-composer
8
0
Fork 2
Code Issues Pull Requests Releases Activity

Add AlmaLinux support patch

Browse Source 
Add AlmaLinux-Kitten support patch
This commit is contained in:
Eduard Abdullin 2025-02-11 11:05:44 +03:00 committed by eabdullin
commit 9df6796ba0
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,3 @@
osbuild-composer-src/
/osbuild-composer-8.tar.gz /osbuild-composer-8.tar.gz
/osbuild-composer-9.tar.gz /osbuild-composer-9.tar.gz
/osbuild-composer-10.tar.gz /osbuild-composer-10.tar.gz
@ -106,3 +105,4 @@ osbuild-composer-src/
/osbuild-composer-126.tar.gz /osbuild-composer-126.tar.gz
/osbuild-composer-127.tar.gz /osbuild-composer-127.tar.gz
/osbuild-composer-128.tar.gz /osbuild-composer-128.tar.gz
/osbuild-composer-131.tar.gz

22
osbuild-composer.spec
View File

@ -8,11 +8,11 @@
%bcond_with relax_requires %bcond_with relax_requires
# The minimum required osbuild version # The minimum required osbuild version
%global min_osbuild_version 129 %global min_osbuild_version 139
%global goipath github.com/osbuild/osbuild-composer %global goipath github.com/osbuild/osbuild-composer
Version: 128 Version: 131
%gometa %gometa
@ -36,9 +36,11 @@ License: Apache-2.0
URL: %{gourl} URL: %{gourl}
Source0: %{gosource} Source0: %{gosource}
Patch1001: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch # AlmaLinux Patch
Patch1002: 0002-Add-AlmaLinux-support.patch Patch1001: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch
Patch1003: 0003-Add-AlmaLinux-Kitten-support.patch Patch1002: 0002-Add-AlmaLinux-support.patch
Patch1003: 0003-Add-AlmaLinux-Kitten-support.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd BuildRequires: systemd
@ -174,7 +176,6 @@ install -m 0644 -vp repositories/almalinux-9* %{buildroot}%
%else %else
# Check for CentOS # Check for CentOS
%if 0%{?centos} %if 0%{?centos}
# Latest CentOS supports building all CentOS versions # Latest CentOS supports building all CentOS versions
@ -217,6 +218,7 @@ done
%endif %endif
%endif %endif
%endif %endif
%endif %endif
# Fedora can build for all included fedora releases # Fedora can build for all included fedora releases
@ -251,7 +253,6 @@ install -m 0755 -vp tools/define-compose-url.sh %{buildroot}%
install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
@ -349,7 +350,7 @@ Summary: The core osbuild-composer binary
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
# This version needs to get bumped everytime the osbuild-depsolve-dnf json # This version needs to get bumped everytime the osbuild-depsolve-dnf json
# API changes in incompatible ways # API changes in incompatible ways
Requires: osbuild-dnf-json-api = 7 Requires: osbuild-dnf-json-api = 8
Provides: %{name}-dnf-json = %{version}-%{release} Provides: %{name}-dnf-json = %{version}-%{release}
Obsoletes: %{name}-dnf-json < %{version}-%{release} Obsoletes: %{name}-dnf-json < %{version}-%{release}
@ -476,10 +477,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Thu Jan 16 2025 Eduard Abdullin <eabdullin@almalinux.org> - 128-1.alma.1 * Tue Feb 11 2025 Eduard Abdullin <eabdullin@almalinux.org> - 131-1.alma.1
- Add AlmaLinux support patch - Add AlmaLinux support patch
- Add AlmaLinux-Kitten support patch - Add AlmaLinux-Kitten support patch
* Wed Feb 05 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 131-1
- New upstream release
* Wed Jan 08 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 128-1 * Wed Jan 08 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 128-1
- New upstream release - New upstream release

2
sources
View File

@ -1 +1 @@
SHA512 (osbuild-composer-128.tar.gz) = 3a14cf8c91e07e9dff268f086e7a54901935062665c72f19b4b3bb50f9338e1da91d412e48fc59d34c2b4b8ba42f4feeb9b06a2d66ee34acb56155630e048666 SHA512 (osbuild-composer-131.tar.gz) = e4b120c8f3dbca66fa1912f6af3f40cdbabdb33f8a9a39488c1ec181330e372966db6f2e41edf0898488c17aace475929725b5648fa90535731bc1d34af583f0