diff --git a/.gitignore b/.gitignore index 4424966..b4f72c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-118.tar.gz +SOURCES/osbuild-composer-132.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index f3abeaa..a51cf1e 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -be808e5f869ae48145daef50ed6ed82b91359b48 SOURCES/osbuild-composer-118.tar.gz +10ef6e6286916cb0c57eae9ea81f8ed063fa8103 SOURCES/osbuild-composer-132.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 031bb49..ff8b1d9 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -8,11 +8,11 @@ %bcond_with relax_requires # The minimum required osbuild version -%global min_osbuild_version 120 +%global min_osbuild_version 139 %global goipath github.com/osbuild/osbuild-composer -Version: 118 +Version: 132 %gometa @@ -36,8 +36,9 @@ License: Apache-2.0 URL: %{gourl} Source0: %{gosource} -Patch101: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch -Patch102: 0002-AlmaLinux-support-patch.patch +# AlmaLinux Patch +Patch101: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch +Patch102: 0002-AlmaLinux-support-patch.patch BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -88,11 +89,10 @@ export PATH=$PWD/_bin${PATH:+:$PATH} export GOPATH=$GO_BUILD_PATH:%{gopath} export GOFLAGS+=" -mod=vendor" %endif -%if 0%{?fedora} -# Fedora disables Go modules by default, but we want to use them. -# Undefine the macro which disables it to use the default behavior. + +# Fedora and RHEL versions disable Go modules by default, but we want to use them. +# Unconditionally undefine the macro which disables it to use the default behavior. %undefine gomodulesmode -%endif # btrfs-progs-devel is not available on RHEL %if 0%{?rhel} @@ -251,7 +251,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/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/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/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -306,8 +305,8 @@ install -m 0644 -vp test/data/x509/* %{buildroot}% install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/ -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9 -install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/ +install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade +install -m 0644 -vp test/data/rhel-upgrade/* %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade/ %endif @@ -347,6 +346,9 @@ cd $PWD/_build/src/%{goipath} %package core Summary: The core osbuild-composer binary Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +# This version needs to get bumped everytime the osbuild-depsolve-dnf json +# API changes in incompatible ways +Requires: osbuild-dnf-json-api = 8 Provides: %{name}-dnf-json = %{version}-%{release} Obsoletes: %{name}-dnf-json < %{version}-%{release} @@ -473,11 +475,41 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Tue Oct 01 2024 Eduard Abdullin - 118-1.alma.1 +* Tue Mar 11 2025 Eduard Abdullin - 132-1.alma.1 - Install AlmaLinux repositories - Add AlmaLinux support patch (Thanks @pastalian) - Remove libreport-rhel-bugzilla from package set +* Thu Feb 13 2025 imagebuilder-bot - 132-1 +- New upstream release + +* Wed Feb 05 2025 imagebuilder-bot - 131-1 +- New upstream release + +* Wed Jan 08 2025 imagebuilder-bot - 128-1 +- New upstream release + +* Wed Dec 11 2024 imagebuilder-bot - 127-1 +- New upstream release + +* Wed Nov 27 2024 imagebuilder-bot - 126-1 +- New upstream release + +* Thu Nov 14 2024 imagebuilder-bot - 125-1 +- New upstream release + +* Fri Nov 01 2024 imagebuilder-bot - 124-1 +- New upstream release + +* Wed Oct 16 2024 imagebuilder-bot - 123-1 +- New upstream release + +* Wed Oct 02 2024 imagebuilder-bot - 122-1 +- New upstream release + +* Mon Sep 30 2024 imagebuilder-bot - 121-1 +- New upstream release + * Fri Aug 23 2024 imagebuilder-bot - 118-1 - New upstream release @@ -516,6 +548,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c * Wed Feb 07 2024 imagebuilder-bot - 100-1 - New upstream release + * Wed Jan 24 2024 imagebuilder-bot - 99-1 - New upstream release @@ -545,6 +578,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c * Thu Aug 24 2023 imagebuilder-bot - 88-1 - New upstream release + * Wed Aug 09 2023 imagebuilder-bot - 87-1 - New upstream release @@ -571,6 +605,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c * Wed Mar 01 2023 imagebuilder-bot - 76-1 - New upstream release + * Wed Feb 22 2023 imagebuilder-bot - 75-1 - New upstream release