Merge branch 'c8' into a8

.gitignore

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

.osbuild-composer.metadata

@@ -1 +1 @@
-507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz
+b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        62
+Version:        75
 
 %gometa
 
@@ -22,14 +22,14 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        3%{?dist}.alma.1
+Release:        1%{?dist}.alma
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
 ExcludeArch:    i686 armv7hl
 
 # Upstream license specification: Apache-2.0
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 Patch100:       almalinux_support.patch
@@ -56,17 +56,6 @@ Requires: systemd
 
 Provides: weldr
 
-%if 0%{?rhel}
-Obsoletes: lorax-composer <= 29
-Conflicts: lorax-composer
-%endif
-
-# Remove when we stop releasing into Fedora 35
-%if 0%{?fedora} >= 34
-# lorax 34.3 is the first one without the composer subpackage
-Obsoletes: lorax-composer < 34.3
-%endif
-
 %description
 %{common_description}
 
@@ -235,9 +224,6 @@ 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/
 
@@ -293,10 +279,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 >= 63
+Requires:   osbuild >= 80
-Requires:   osbuild-ostree >= 63
+Requires:   osbuild-ostree >= 80
-Requires:   osbuild-lvm2 >= 63
+Requires:   osbuild-lvm2 >= 80
-Requires:   osbuild-luks2 >= 63
+Requires:   osbuild-luks2 >= 80
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description worker
@@ -313,8 +299,9 @@ 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 following lines mimicks its behaviour by running two commands.
-if [ -d /run/systemd/system ]; then
+# The scriptlet is supposed to run only when the package is being removed.
+if [ $1 -eq 0 ] && [ -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"
@@ -328,7 +315,7 @@ fi
 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
+# this can be removed when RHEL 8 reaches EOL
 Conflicts: osbuild-composer <= 35
 
 %description dnf-json
@@ -414,17 +401,35 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Thu Feb 09 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 62-3.alma.1
+* Tue May 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 75-1.alma
 - Fixed AlmaLinux 9 GPG key (thanks elektrowolle)
 
-* Tue Nov 08 2022 Eduard Abdullin <eabdullin@almalinux.org> - 62-3.alma
+* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
-- Install AlmaLinux repositories
+- New upstream release
-- Add AlmaLinux support
 
-* Tue Oct 25 2022 Tomáš Hozza <thozza@redhat.com> - 62-3
+* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
-- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
+- 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)
+* Wed Jan 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
+- New upstream release
+
+* Wed Jan 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
+- New upstream release
+
+* Wed Dec 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
+- New upstream release
+
+* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
+- New upstream release
+
+* 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
 
 * Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
 - New upstream release