.gitignore

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

.osbuild-composer.metadata

@@ -1 +1 @@
-ee89270c23a5906f61475ba5be5bd43c5dc741e2 SOURCES/osbuild-composer-70.tar.gz
+507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        70
+Version:        62
 
 %gometa
 
@@ -22,7 +22,7 @@ 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 and armv7hl images
@@ -251,6 +251,9 @@ install -m 0644 -vp test/data/koji/*                               %{buildroot}%
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/x509
 install -m 0644 -vp test/data/x509/*                               %{buildroot}%{_datadir}/tests/osbuild-composer/x509/
 
+install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/openshift
+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 pkg/jobqueue/dbjobqueue/schemas/*              %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
 
@@ -306,10 +309,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 >= 70
-Requires:   osbuild-ostree >= 70
-Requires:   osbuild-lvm2 >= 70
-Requires:   osbuild-luks2 >= 70
+Requires:   osbuild >= 63
+Requires:   osbuild-ostree >= 63
+Requires:   osbuild-lvm2 >= 63
+Requires:   osbuild-luks2 >= 63
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description worker
@@ -326,9 +329,8 @@ The worker for osbuild-composer
 %preun worker
 # 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.
-# The scriptlet is supposed to run only when the package is being removed.
-if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then
+# The following lines mimicks its behaviour by running two commands:
+if [ -d /run/systemd/system ]; then
     # disable and stop all the worker services
     systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
     systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
@@ -428,17 +430,11 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
-- New upstream release
+* Tue Oct 25 2022 Tomáš Hozza <thozza@redhat.com> - 62-3
+- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
 
-* Wed Nov 30 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 69-1
-- New upstream release
-
-* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
-- New upstream release
-
-* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
-- New upstream release
+* 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