diff --git a/.gitignore b/.gitignore index 1a38a34..c68627e 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /osbuild-composer-46.2.tar.gz /osbuild-composer-49.tar.gz /osbuild-composer-50.tar.gz +/osbuild-composer-46.3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 169395f..10430a8 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -13,7 +13,6 @@ copy_upstream_release_description: true upstream_tag_template: v{version} -srpm_build_deps: [] actions: get-current-version: bash -c "git describe --tags --abbrev=0 | sed 's|v||'" diff --git a/README.packit b/README.packit index 06da437..484032d 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.49.0. +The file was generated using packit 0.49.1.dev5+gc36800b. diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 04f907a..aea18b2 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 50 +Version: 46.3 %gometa @@ -52,7 +52,6 @@ BuildRequires: golang(github.com/deepmap/oapi-codegen/pkg/codegen) BuildRequires: golang(github.com/go-chi/chi) BuildRequires: golang(github.com/golang-jwt/jwt) BuildRequires: golang(github.com/google/uuid) -BuildRequires: golang(github.com/hashicorp/go-retryablehttp) BuildRequires: golang(github.com/jackc/pgx/v4) BuildRequires: golang(github.com/julienschmidt/httprouter) BuildRequires: golang(github.com/getkin/kin-openapi/openapi3) @@ -228,7 +227,6 @@ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}% install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/koji-compose-v2.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ -install -m 0755 -vp tools/s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer @@ -326,10 +324,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe Summary: The worker for osbuild-composer Requires: systemd Requires: qemu-img -Requires: osbuild >= 52 -Requires: osbuild-ostree >= 52 -Requires: osbuild-lvm2 >= 52 -Requires: osbuild-luks2 >= 52 +Requires: osbuild >= 49 +Requires: osbuild-ostree >= 49 +Requires: osbuild-lvm2 >= 49 +Requires: osbuild-luks2 >= 49 Requires: %{name}-dnf-json = %{version}-%{release} # remove in F34 @@ -420,7 +418,10 @@ Requires: httpd Requires: mod_ssl Requires: openssl Requires: firewalld +# see https://bugzilla.redhat.com/show_bug.cgi?id=1986333 +%if 0%{?rhel} && 0%{?rhel} != 9 Requires: podman-plugins +%endif Requires: dnf-plugins-core Requires: skopeo %if 0%{?fedora} @@ -445,6 +446,16 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Apr 28 2022 Packit - 46.3-1 +CHANGES WITH 46.3: +---------------- + * disk: fix ensureLVM for partition tables without /boot (#2580) + +Contributions from: Achilleas Koutsou, Christian Kellner + +— Liberec, 2022-04-28 + + * Wed Apr 20 2022 Packit - 50-1 Changes with 50 ---------------- diff --git a/sources b/sources index 9b1662c..8da06ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-50.tar.gz) = cad6e67f09f9d0d2273ebf1459f9f00e2ad5149c0c3506c5b2986ae33cf4f3478fdeba888c7d5cfefe87bfe425f5d5e5c96fa75bbf5afbabf47cedb273c63d8b +SHA512 (osbuild-composer-46.3.tar.gz) = 4935b09b1141f587bc494389f9528d94cd95f26d7766adef52b1ee48b54cd773dcd9cc2b0411fb9a39578a29882b33098a4787bfff9f48ceef5919a591531a08