diff --git a/.gitignore b/.gitignore index 84a160c..1048e74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-46.1.tar.gz +SOURCES/osbuild-composer-53.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 6c7fad8..c810e40 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -55a55383596c7c12ebce0eeac0d4aa05c894c68b SOURCES/osbuild-composer-46.1.tar.gz +9f352b93b20672cfb797f1759fa0823e755b090b SOURCES/osbuild-composer-53.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index b48af6e..591b1a6 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 46.1 +Version: 53 %gometa @@ -50,8 +50,9 @@ BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/activation) 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/golang-jwt/jwt/v4) 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) @@ -227,6 +228,7 @@ 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 @@ -324,10 +326,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 >= 49 -Requires: osbuild-ostree >= 49 -Requires: osbuild-lvm2 >= 49 -Requires: osbuild-luks2 >= 49 +Requires: osbuild >= 55 +Requires: osbuild-ostree >= 55 +Requires: osbuild-lvm2 >= 55 +Requires: osbuild-luks2 >= 55 Requires: %{name}-dnf-json = %{version}-%{release} # remove in F34 @@ -418,10 +420,7 @@ 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} @@ -446,7 +445,10 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Fri Apr 01 2022 Simon Steinbeiss - 46.1-1 +* Mon May 23 2022 imagebuilder-bot - 53-1 +- New upstream release + +* Wed May 04 2022 Ondřej Budai - 51-1 - New upstream release * Tue Mar 01 2022 Ondřej Budai - 46-1