.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-composer-33.3.tar.gz
+SOURCES/osbuild-composer-62.tar.gz

.osbuild-composer.metadata

@@ -1 +1 @@
-dc7e4c6864e1f23c1250b7cffd8f2e5c8b346af7 SOURCES/osbuild-composer-33.3.tar.gz
+507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz

SPECS/osbuild-composer.spec

@@ -2,9 +2,14 @@
 # Pass --with tests to rpmbuild to override
 %bcond_with tests
 
+# When --with relax_requires is specified osbuild-composer-tests
+# will require osbuild-composer only by name, excluding version/release
+# This is used internally during nightly pipeline testing!
+%bcond_with relax_requires
+
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        33.3
+Version:        62
 
 %gometa
 
@@ -17,12 +22,11 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        An image building service based on osbuild
 
-# osbuild-composer doesn't have support for building i686 images
+# osbuild-composer doesn't have support for building i686 and armv7hl images
-# and also RHEL and Fedora has now only limited support for this arch.
+ExcludeArch:    i686 armv7hl
-ExcludeArch:    i686
 
 # Upstream license specification: Apache-2.0
 License:        ASL 2.0
@@ -35,32 +39,15 @@ BuildRequires:  systemd
 BuildRequires:  krb5-devel
 BuildRequires:  python3-docutils
 BuildRequires:  make
+# Build requirements of 'theproglottis/gpgme' package
+BuildRequires:  gpgme-devel
+BuildRequires:  libassuan-devel
 %if 0%{?fedora}
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  git
-BuildRequires:  golang(github.com/aws/aws-sdk-go)
+# DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
-BuildRequires:  golang(github.com/Azure/azure-sdk-for-go)
+# BUNDLE_START
-BuildRequires:  golang(github.com/Azure/azure-storage-blob-go/azblob)
+# BUNDLE_END
-BuildRequires:  golang(github.com/BurntSushi/toml)
-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/google/uuid)
-BuildRequires:  golang(github.com/jackc/pgx/v4)
-BuildRequires:  golang(github.com/julienschmidt/httprouter)
-BuildRequires:  golang(github.com/getkin/kin-openapi/openapi3)
-BuildRequires:  golang(github.com/kolo/xmlrpc)
-BuildRequires:  golang(github.com/labstack/echo/v4)
-BuildRequires:  golang(github.com/gobwas/glob)
-BuildRequires:  golang(github.com/google/go-cmp/cmp)
-BuildRequires:  golang(github.com/gophercloud/gophercloud)
-BuildRequires:  golang(github.com/prometheus/client_golang/prometheus/promhttp)
-BuildRequires:  golang(github.com/stretchr/testify/assert)
-BuildRequires:  golang(github.com/ubccr/kerby)
-BuildRequires:  golang(github.com/vmware/govmomi)
-BuildRequires:  golang(cloud.google.com/go)
-BuildRequires:  golang(gopkg.in/ini.v1)
 %endif
 
 Requires: %{name}-core = %{version}-%{release}
@@ -80,13 +67,6 @@ Conflicts: lorax-composer
 Obsoletes: lorax-composer < 34.3
 %endif
 
-# remove in F34
-Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
-Provides:  golang-github-osbuild-composer = %{version}-%{release}
-
-# remove when F34 is EOL
-Obsoletes: osbuild-composer-koji <= 23
-
 %description
 %{common_description}
 
@@ -94,19 +74,11 @@ Obsoletes: osbuild-composer-koji <= 23
 %if 0%{?rhel}
 %forgeautosetup -p1
 %else
-%goprep
+%goprep -k
-%endif
-
-%if 0%{?fedora} >= 34
-# Fedora 34 and newer ships a newer version of github.com/getkin/kin-openapi
-# package which has a different API than the older ones. Let's make the auto-
-# generated code compatible by applying some sed magic.
-#
-# Remove when F33 is EOL
-sed -i "s/openapi3.Swagger/openapi3.T/;s/openapi3.NewSwaggerLoader().LoadSwaggerFromData/openapi3.NewLoader().LoadFromData/" internal/cloudapi/openapi.gen.go
 %endif
 
 %build
+export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
 GO_BUILD_PATH=$PWD/_build
 install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
@@ -115,9 +87,17 @@ cd $GO_BUILD_PATH/src/%{goipath}
 install -m 0755 -vd _bin
 export PATH=$PWD/_bin${PATH:+:$PATH}
 export GOPATH=$GO_BUILD_PATH:%{gopath}
-export GOFLAGS=-mod=vendor
+export GOFLAGS+=" -mod=vendor"
 %endif
 
+# Set the commit hash so that composer can report what source version
+# was used to build it. This has to be set explicitly when calling rpmbuild,
+# this script will not attempt to automatically discover it.
+%if %{?commit:1}0
+export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'"
+%endif
+export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'"
+
 %gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
 %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
 
@@ -145,7 +125,9 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-te
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
-go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/cloud-cleaner %{goipath}/cmd/cloud-cleaner
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
+go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
 
 %endif
 
@@ -209,7 +191,9 @@ install -m 0755 -vp _bin/osbuild-image-tests                    %{buildroot}%{_l
 install -m 0755 -vp _bin/osbuild-auth-tests                        %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-koji-tests                        %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests         %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp _bin/cloud-cleaner                          %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp _bin/osbuild-composer-manifest-tests           %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp _bin/osbuild-service-maintenance-tests         %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp _bin/osbuild-mock-openid-provider              %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/define-compose-url.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/
@@ -218,8 +202,20 @@ install -m 0755 -vp tools/image-info                            %{buildroot}%{_l
 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/
+install -m 0755 -vp tools/s3_test.sh                               %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp tools/generic_s3_test.sh                       %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp tools/generic_s3_https_test.sh                 %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp tools/run-mock-auth-servers.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
-install -m 0755 -vp test/cases/*                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp test/cases/*.sh                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+
+install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/api
+install -m 0755 -vp test/cases/api/*.sh                            %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/
+
+install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common
+install -m 0755 -vp test/cases/api/common/*.sh                     %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common/
 
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
 install -m 0644 -vp test/data/ansible/*                            %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
@@ -259,13 +255,17 @@ install -m 0755 -vd                                             %{buildroot}%{_d
 install -m 0644 -vp test/data/openshift/*                          %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/
 
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
-install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/*      %{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/
 
 %endif
 
 %check
+export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
-export GOFLAGS=-mod=vendor
+export GOFLAGS+=" -mod=vendor"
 export GOPATH=$PWD/_build:%{gopath}
 # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
 cd $PWD/_build/src/%{goipath}
@@ -296,25 +296,24 @@ cd $PWD/_build/src/%{goipath}
 
 %package core
 Summary:    The core osbuild-composer binary
+Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description core
 The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
 
 %files core
 %{_libexecdir}/osbuild-composer/osbuild-composer
-%{_libexecdir}/osbuild-composer/dnf-json
 %{_datadir}/osbuild-composer/
 
 %package worker
 Summary:    The worker for osbuild-composer
 Requires:   systemd
 Requires:   qemu-img
-Requires:   osbuild >= 30
+Requires:   osbuild >= 63
-Requires:   osbuild-ostree >= 30
+Requires:   osbuild-ostree >= 63
-
+Requires:   osbuild-lvm2 >= 63
-# remove in F34
+Requires:   osbuild-luks2 >= 63
-Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
+Requires:   %{name}-dnf-json = %{version}-%{release}
-Provides:  golang-github-osbuild-composer-worker = %{version}-%{release}
 
 %description worker
 The worker for osbuild-composer
@@ -331,20 +330,44 @@ The worker for osbuild-composer
 # systemd_preun uses systemctl disable --now which doesn't work well with template services.
 # See https://github.com/systemd/systemd/issues/15620
 # The following lines mimicks its behaviour by running two commands:
-
+if [ -d /run/systemd/system ]; then
-# disable and stop all the worker services
+    # disable and stop all the worker services
-systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
+    systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
-systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
+    systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
+fi
 
 %postun worker
 # restart all the worker services
 %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 
+%package dnf-json
+Summary: The dnf-json binary used by osbuild-composer and the workers
+
+# Conflicts with older versions of composer that provide the same files
+# this can be removed when RHEL 8 and Fedora 35 reach EOL
+Conflicts: osbuild-composer <= 35
+
+%description dnf-json
+The dnf-json binary used by osbuild-composer and the workers.
+
+%files dnf-json
+%{_libexecdir}/osbuild-composer/dnf-json
+
+%post dnf-json
+# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
+if [ -e /var/cache/osbuild-composer/rpmmd ]; then
+    chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
+fi
+
 %if %{with tests} || 0%{?rhel}
 
 %package tests
 Summary:    Integration tests
+%if %{with relax_requires}
+Requires:   %{name}
+%else
 Requires:   %{name} = %{version}-%{release}
+%endif
 Requires:   composer-cli
 Requires:   createrepo_c
 Requires:   xorriso
@@ -372,6 +395,7 @@ Requires:   libvirt-daemon-driver-storage-disk
 Requires:   libvirt-daemon-kvm
 Requires:   qemu-img
 Requires:   qemu-kvm
+Requires:   rpmdevtools
 Requires:   virt-install
 Requires:   expect
 Requires:   python3-lxml
@@ -379,12 +403,11 @@ 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
+Requires:   make
+Requires:   python3-pip
 %if 0%{?fedora}
 # koji and ansible are not in RHEL repositories. Depending on them breaks RHEL
 # gating (see OSCI-1541). The test script must enable EPEL and install those
@@ -407,109 +430,108 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Sat Oct 02 2021 Ondřej Budai <ondrej@budai.cz> - 33.3-1
+* Tue Oct 25 2022 Tomáš Hozza <thozza@redhat.com> - 62-3
+- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
+
+* Fri Oct 21 2022 Tomáš Hozza <thozza@redhat.com> - 62-2
+- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
+
+* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
 - New upstream release
 
-* Tue Sep 28 2021 Ondřej Budai <ondrej@budai.cz> - 33.2-1
+* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
 - New upstream release
 
-* Wed Sep 15 2021 Ondřej Budai <ondrej@budai.cz> - 33.1-1
+* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
+- New upstream release
+
+* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
+- New upstream release
+
+* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
+- New upstream release
+
+* Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
+- New upstream release
+
+* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
+- New upstream release
+
+* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
+- New upstream release
+
+* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
+- New upstream release
+
+* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
+- New upstream release
+
+* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
+- New upstream release
+
+* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
+- New upstream release
+
+* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
+- New upstream release
+
+* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
+- New upstream release
+
+* Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
+- New upstream release
+
+* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
+- New upstream release
+
+* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
 - New upstream release
 
 * Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
 - New upstream release
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
 - New upstream release
 
-* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
+* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
-- New upstream release
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
-- New upstream release
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
 - New upstream release
 
 * Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
 - New upstream release
 
-* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
+* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
 - New upstream release
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
-- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
-
 * Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
 - New upstream release
 
-* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
+* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
-- New upstream release
+- New upstream release 25 (rhbz#1883481)
 
-* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
+* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
-- New upstream release
+- New upstream release 20.1 (rhbz#1872370)
 
-* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
+* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
-- New upstream release
+- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
 
-* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
+* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
-- New upstream release
+- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
 
-* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
+* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
-- New upstream release
+- New upstream release 17 (rhbz#1831653)
-
+- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
-* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
-- New upstream release
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
-- New upstream release
-
-* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
-- New upstream release
 
 * Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
-- New upstream release
+- New upstream release 16 (rhbz#1831653)
 
 * Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
-- New upstream release
+- New upstream release 15 (rhbz#1831653)
 
 * Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
-- New upstream release
+- New upstream release 14 (rhbz#1831653)
-
-* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
-- Add missing osbuild-ostree dependency
 
 * Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
-- New upstream release
+- New upstream release 13 (rhbz#1831653)
 
-* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
+* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
-- New upstream release
+- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)
-
-* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
-- New upstream release
-
-* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
-- New upstream release
-
-* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
-- New upstream release
-
-* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
-- Initial package (renamed from golang-github-osbuild-composer)