Sync from SUSE:SLFO:Main product-composer revision 900ada227bc77e6402f3d2971eb493c6

_service

@@ -2,13 +2,13 @@
   <service name="obs_scm" mode="manual">
     <param name="url">https://github.com/openSUSE/product-composer</param>
     <param name="scm">git</param>
-    <param name="revision">0.4.18</param>
-    <param name="version">0.4.18</param>
+    <param name="revision">0.6.12</param>
+    <param name="version">0.6.12</param>
   </service>
-  <service name="set_version" mode="manual" />
-  <service name="tar" mode="buildtime" />
-  <service name="recompress" mode="buildtime">
+  <service name="tar" mode="manual" />
+  <service name="recompress" mode="manual">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
+  <service name="set_version" mode="manual" />
 </services>

product-composer.changes

@@ -1,3 +1,279 @@
+-------------------------------------------------------------------
+Wed Aug  6 11:46:15 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.12:
+  * Compress appstream meta data only with gz (boo#1247510)
+  * Add appstream screenshots.tar uncompressed if available.
+
+-------------------------------------------------------------------
+Mon Aug  4 08:03:58 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.11:
+  * Exclude vendor name in media.1/products file (backward compatibility)
+  * Add appstream data to repomd.xml (boo#1243078)
+
+-------------------------------------------------------------------
+Tue Jul 22 14:01:36 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.10:
+  * fixing missing debuginfo package in case dwz compression
+    mechanic is used.
+
+-------------------------------------------------------------------
+Fri Jul 11 06:37:35 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.9:
+  * Create the .license directory independend of iso generation
+  * Support set_updateinfo_id_prefix to be set per flavor
+
+-------------------------------------------------------------------
+Mon Jul  7 13:13:36 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.8:
+  * One more attempt for crashes in iso handling
+  * Accept product_name_prefix key in scc block
+
+-------------------------------------------------------------------
+Fri Jul  4 11:46:29 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.7:
+  * Make the diskusage estimation compatible to the old implementation.
+    Doing the kb conversation by file to cover fs block size
+  * Implement option to follow package version for product
+
+-------------------------------------------------------------------
+Fri Jul  4 10:29:58 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.6
+  * verify command works now also for setups which only builds
+    via a flavor
+  * Export directory content sizes in kb (boo#1245709)
+
+-------------------------------------------------------------------
+Thu Jul  3 14:54:15 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.5
+  * Fixing further regressions of refactoring for iso building
+
+-------------------------------------------------------------------
+Thu Jul  3 09:30:47 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.4
+  * Fixing the iso parsing crash for real
+
+-------------------------------------------------------------------
+Mon Jun 30 08:01:00 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.3
+  * include last two patches, obsoleting 
+    - change-fitering-error-to-warning.patch
+    - parse-supportstatus.patch
+  * fixing a crash when iso's are only enabled in flavors
+- fix build/version handling after the change to setuptools_scm
+
+-------------------------------------------------------------------
+Wed Jun 25 09:47:33 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- add change-fitering-error-to-warning.patch:
+  * Change updateinfo filtering error to a warning
+
+-------------------------------------------------------------------
+Tue Jun 24 13:24:31 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- add parse-supportstatus.patch:
+  * fixes crash on parsing supportstatus information
+
+-------------------------------------------------------------------
+Wed Jun  4 14:34:39 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.2
+  * crash fix for agama builds
+  * Rework package set calculation
+
+    The new code allows to reference package sets that are defined
+    later in the recipe. It also allows to specify a flavor or
+    architecture in the reference, so that a flavor can reuse the
+    package set of a different flavor.
+
+-------------------------------------------------------------------
+Wed Jun  4 13:33:43 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.1:
+  * fixing a crash when no 'iso' tag is defined
+
+-------------------------------------------------------------------
+Mon Jun  2 09:29:18 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.6.0:
+  * obsolete schema dependency again and rely on pydantic
+  * support AppStream generation
+  * support packageset selections in flavors via content and unpack
+  * allow overwrite of supportstatus via = prefix
+  * larger code refactoring for first unit tests
+
+-------------------------------------------------------------------
+Wed May 21 10:38:30 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- add missing dependency to python schema module
+
+-------------------------------------------------------------------
+Fri May 16 13:28:58 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.16:
+  * package EULA support added
+  * agama: do not take the iso meta data from the agama iso
+  * code cleanup and refactoring
+  * build description files are now validated.
+  * verify command is now checking all flavors by default.
+
+-------------------------------------------------------------------
+Tue May 13 12:34:06 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.15:
+  * fix generation of gpg-pubkey content tags
+  * Do not error out in updateinfo_packages_only mode if packages are not found
+  * Set BUILD_DIR before calling the sbom generator
+  * Handle build_options in flavors different
+    Add them to the global set, instead of replacing the global set.
+  * Fix handover of multiple --build-option cli parameters
+
+-------------------------------------------------------------------
+Mon May 12 08:41:24 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.14:
+  * fixing CPE-ID generation (ommit * in empty fields)
+  * allowing to select build-options via cli and project build configuration
+
+-------------------------------------------------------------------
+Wed Apr 30 12:36:01 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.13:
+  * support encoding of "update" and "edition" fields into CPE
+  * allow blacklisting binaries via updateinfo flag
+  * allow to specify repodata config per flavor
+
+-------------------------------------------------------------------
+Mon Mar 31 10:05:44 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.12:
+  * Fix handling of internal updateinfo.xml attributes
+    supportstatus, superseded_by and embargo_date .
+
+-------------------------------------------------------------------
+Fri Mar 21 15:43:58 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.11
+  * cli: keep creating Source and Debug images when using the baseiso feature
+  * fix crash on missing summary field
+
+-------------------------------------------------------------------
+Fri Feb 28 16:04:33 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.10
+  * allow to specify build_options per flavor
+  * build_option for skiping copy of rpm-md trees to base iso
+  * build_option for updateinfo_packages_only
+  * bugfixes and cleanup
+
+-------------------------------------------------------------------
+Tue Feb 25 14:04:48 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.9
+
+  Crash fix for offline media build using splitted repodata
+
+-------------------------------------------------------------------
+Mon Feb 24 10:35:48 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.8
+
+  Added missing bits for splitted source medium
+
+-------------------------------------------------------------------
+Fri Feb 21 13:25:46 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.7
+
+  Fixing splitted repodata handling with splitted source medium
+
+-------------------------------------------------------------------
+Thu Feb 20 14:57:49 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.6
+
+  Call verifymedia on generated bootable media for verbose output
+  in log file. It is not fatal yet, due to a known issue in agama
+  base images, but that will be changed.
+
+-------------------------------------------------------------------
+Wed Feb 19 12:37:02 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.5
+
+  Suport architecture specific meta data
+
+-------------------------------------------------------------------
+Mon Feb 10 12:42:11 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.4
+
+  support source and debug settings per flavor
+
+  generate sha256 files for install.iso
+
+-------------------------------------------------------------------
+Thu Feb  6 09:11:29 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.3
+
+  Adding skip_updateinfos build option to pass issue #14
+
+-------------------------------------------------------------------
+Thu Jan 30 09:14:14 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.2
+
+  Handle baseisos like meta packages
+
+  This means we don't expect them deployed in the build host system
+  anymore. Instead we search for them in the given repositories for
+  the product and unpack the containment rpm.
+
+  The wanted side effect of this is that products will get rebuild,
+  when the baseiso has changed now.
+
+-------------------------------------------------------------------
+Wed Jan 29 12:39:26 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.1
+  * use mksusecd instead of xorriso, fixes boot partition, requires root
+
+-------------------------------------------------------------------
+Tue Jan 28 16:03:00 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.5.0
+  * New option to add generated rpm-md tree to a base image.
+    Can be used to create an agama based offline installer image.
+
+-------------------------------------------------------------------
+Fri Jan 24 09:29:41 UTC 2025 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.21
+  * Use generate_sbom from OBS server instance if available
+    (boo#1231141)
+
+-------------------------------------------------------------------
+Mon Sep 30 10:22:13 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.20
+  * fix logic of installcheck fatality
+
+-------------------------------------------------------------------
+Wed Sep 25 14:34:24 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.19
+  * Avoid hanging installcheck with large output
+
 -------------------------------------------------------------------
 Mon Sep 23 10:50:59 UTC 2024 - Adrian Schröter <adrian@suse.de>
 
@@ -129,11 +405,11 @@ Wed Mar  6 15:11:10 UTC 2024 - Adrian Schröter <adrian@suse.de>
 
 - update to version 0.4.0
   Replacement of susedata tool, first part
-  
+
   - Add supportstatus
   - Add gpg trusted keys
   - switch to SHA512 checksum
-  
+
   Missing:
   - diskusage data
   - package translations

product-composer.obsinfo

@@ -1,4 +1,4 @@
 name: product-composer
-version: 0.4.18
-mtime: 1727085142
-commit: 5467b6476bad0319e33fe6b65be0a7550bdc3328
+version: 0.6.12
+mtime: 1754478947
+commit: 8d5a403f4206893cfecfd243da7dbff152fbc2d5

product-composer.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package product-composer
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %endif
 
 Name:           product-composer
-Version:        0.4.18
+Version:        0.6.12
 Release:        0
 Summary:        Product Composer
 License:        GPL-2.0-or-later
@@ -31,10 +31,11 @@ Group:          Development/Tools/Building
 URL:            https://github.com/openSUSE/product-composer
 Source:         %name-%{version}.tar.xz
 # Should become a build option
-Patch1:         sle-15-defaults.patch
+Patch10:        sle-15-defaults.patch
 BuildRequires:  %{used_python}-pip
 BuildRequires:  %{used_python}-poetry-core
 BuildRequires:  %{used_python}-setuptools
+BuildRequires:  %{used_python}-setuptools_scm
 BuildRequires:  %{used_python}-wheel
 Requires:       %{used_python}-PyYAML
 Requires:       %{used_python}-pydantic
@@ -47,6 +48,7 @@ Requires:       createrepo_c
 Requires:       inst-source-utils
 Requires:       libsolv-tools
 Requires:       mkisofs
+Requires:       mksusecd >= 3.5
 BuildArch:      noarch
 
 %description
@@ -57,10 +59,11 @@ WARNING: please be aware that the code is still on the move and is
 %prep
 %setup -q -n %name-%version
 %if "%{?sle_version}" == "150600"
-%patch -P 1 -p1
+%patch -P 10 -p1
 %endif
 
 %build
+export SETUPTOOLS_SCM_PRETEND_VERSION=%version
 %if "%{?sle_version}" == "150600"
 %python311_pyproject_wheel
 %else