.gitignore

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

.osbuild-composer.metadata

@@ -1 +1 @@
-f69958ce00b7640e4ff730648dff7e790898c7f2 SOURCES/osbuild-composer-67.tar.gz
+b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz

SOURCES/tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch

@@ -1,38 +0,0 @@
-From 1e5a7526369ec0bfd4bd5c536ff16f534f023fd5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
-Date: Wed, 2 Nov 2022 12:18:46 +0100
-Subject: [PATCH] tools/provision.sh: copy RHEL repo overrides using wildcard
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Don't list specific RHEL repos which should be copied over to the repo
-overrides directory, but instead copy all of them, similar to how it's
-done for Fedora and CentOS Stream. This is less error prone when support
-for a new RHEL release is added to composer.
-
-Signed-off-by: Tomáš Hozza <thozza@redhat.com>
----
- tools/provision.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/tools/provision.sh b/tools/provision.sh
-index 93f8cccbd..09265f907 100755
---- a/tools/provision.sh
-+++ b/tools/provision.sh
-@@ -140,11 +140,7 @@ else # AUTH_METHOD_NONE
-     # Copy all fedora repo overrides
-     sudo cp -a /usr/share/tests/osbuild-composer/repositories/{fedora,centos}-*.json "$REPODIR"
-     # Copy RHEL point release repos
--    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-85.json "$REPODIR"
--    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-86.json "$REPODIR"
--    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-87.json "$REPODIR"
--    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-90.json "$REPODIR"
--    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-91.json "$REPODIR"
-+    sudo cp -a /usr/share/tests/osbuild-composer/repositories/rhel-*.json "$REPODIR"
- 
-     # override source repositories to consume content from the nightly compose
-     if [ "${NIGHTLY:=false}" == "true" ]; then
--- 
-2.37.3
-

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        67
+Version:        75
 
 %gometa
 
@@ -29,12 +29,10 @@ Summary:        An image building service based on osbuild
 ExcludeArch:    i686 armv7hl
 
 # Upstream license specification: Apache-2.0
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
-# https://github.com/osbuild/osbuild-composer/pull/3111
-Patch0:         tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -58,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}
 
@@ -308,10 +295,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 >= 80
+Requires:   osbuild-ostree >= 80
+Requires:   osbuild-lvm2 >= 80
+Requires:   osbuild-luks2 >= 80
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description worker
@@ -328,8 +315,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:
-if [ -d /run/systemd/system ]; then
+# 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
     # 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"
@@ -343,7 +331,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
@@ -429,6 +417,30 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
+- New upstream release
+
+* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
+- New upstream release
+
+* 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