Sync from SUSE:ALP:Source:Standard:1.0 product-composer revision d86024144b86723df67ee7cd9c2bf2e8

_service

@@ -2,8 +2,8 @@
   <service name="obs_scm" mode="manual">
     <param name="url">https://github.com/openSUSE/product-composer</param>
     <param name="scm">git</param>
-    <param name="version">0.4.9</param>
+    <param name="revision">0.4.18</param>
-    <param name="revision">0.4.9</param>
+    <param name="version">0.4.18</param>
   </service>
   <service name="set_version" mode="manual" />
   <service name="tar" mode="buildtime" />

product-composer.changes

@@ -1,3 +1,64 @@
+-------------------------------------------------------------------
+Mon Sep 23 10:50:59 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.18
+  * Fix product name in SPDX SBOM files (was hardcoded to ALP)
+  * Some more progress lines for logfile
+
+-------------------------------------------------------------------
+Mon Sep  2 12:18:07 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.17
+  * abort_on_empty_updateinfo option added
+  * allow to drop directory tree after iso generation
+  * allow to enable iso generation by flavor
+
+-------------------------------------------------------------------
+Mon Jul 22 11:48:03 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.16
+  * Crash fixes on incomplete iso spec or PkgSet substraction
+
+-------------------------------------------------------------------
+Wed Jul 17 12:24:00 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.15
+  * avoid double export of -debug packages when using "all" option
+
+-------------------------------------------------------------------
+Tue Jul 16 12:23:34 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.14
+  * added option to run installcheck
+    => new dependency to libsolv-tools therefore
+
+-------------------------------------------------------------------
+Thu Jul 11 12:52:03 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.13
+  * crash fix for "all available packages" option
+
+-------------------------------------------------------------------
+Mon Jul  8 09:37:08 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.12
+  * fixed susedata generation (only a single language translation was generated)
+  * Added option to include all available packages
+
+-------------------------------------------------------------------
+Wed Jun 26 11:55:22 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.11
+  * canonized filenames (get rid of ::import prefixes)
+
+-------------------------------------------------------------------
+Wed Jun 26 10:36:50 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- update to version 0.4.10
+  * support building on 15.6, using python311 stack (added sle-15-defaults.patch)
+  * changing createrepo defaults for SLE 15 only
+  * crash fix on incomplete generated groups by pkglistgen
+
 -------------------------------------------------------------------
 Wed Jun 26 07:57:25 UTC 2024 - Adrian Schröter <adrian@suse.de>
 

product-composer.obsinfo

@@ -1,4 +1,4 @@
 name: product-composer
-version: 0.4.9
+version: 0.4.18
-mtime: 1719386627
+mtime: 1727085142
-commit: d968fed0a93138406bcc9b1a976e54313640299e
+commit: 5467b6476bad0319e33fe6b65be0a7550bdc3328

product-composer.spec

@@ -16,27 +16,36 @@
 #
 
 
+%if "%{?sle_version}" == "150600"
+%define used_python python311
+%else
+%define used_python python3
+%endif
+
 Name:           product-composer
-Version:        0.4.9
+Version:        0.4.18
 Release:        0
 Summary:        Product Composer
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Building
 URL:            https://github.com/openSUSE/product-composer
 Source:         %name-%{version}.tar.xz
-BuildRequires:  python3-pip
+# Should become a build option
-BuildRequires:  python3-poetry-core
+Patch1:         sle-15-defaults.patch
-BuildRequires:  python3-setuptools
+BuildRequires:  %{used_python}-pip
-BuildRequires:  python3-wheel
+BuildRequires:  %{used_python}-poetry-core
-Requires:       python3-PyYAML
+BuildRequires:  %{used_python}-setuptools
-Requires:       python3-pydantic
+BuildRequires:  %{used_python}-wheel
-Requires:       python3-rpm
+Requires:       %{used_python}-PyYAML
-Requires:       python3-zstandard
+Requires:       %{used_python}-pydantic
+Requires:       %{used_python}-rpm
+Requires:       %{used_python}-zstandard
 # build for signdummy
 Requires:       build
 Requires:       checkmedia
-Requires:       createrepo
+Requires:       createrepo_c
 Requires:       inst-source-utils
+Requires:       libsolv-tools
 Requires:       mkisofs
 BuildArch:      noarch
 
@@ -46,18 +55,33 @@ WARNING: please be aware that the code is still on the move and is
          likely to break with productcompose file syntax changes.
 
 %prep
-%autosetup -n %name-%version -p1
+%setup -q -n %name-%version
+%if "%{?sle_version}" == "150600"
+%patch -P 1 -p1
+%endif
 
 %build
+%if "%{?sle_version}" == "150600"
+%python311_pyproject_wheel
+%else
 %python3_pyproject_wheel
+%endif
 
 %install
+%if "%{?sle_version}" == "150600"
+%python311_pyproject_install
+%else
 %python3_pyproject_install
+%endif
 mv %buildroot/usr/bin/productcomposer %buildroot%_bindir/product-composer
 
 %files
 %doc README.rst docs examples
 %_bindir/product-composer
+%if "%{?sle_version}" == "150600"
+%{python311_sitelib}/*
+%else
 %{python3_sitelib}/*
+%endif
 
 %changelog

sle-15-defaults.patch

@@ -0,0 +1,12 @@
+diff --git a/src/productcomposer/defaults.py b/src/productcomposer/defaults.py
+index 4493328..1b351ef 100644
+--- a/src/productcomposer/defaults.py
++++ b/src/productcomposer/defaults.py
+@@ -7,5 +7,5 @@ and explicitly pass them to the programs.
+ """
+ 
+ 
+-CREATEREPO_CHECKSUM_TYPE: str = "sha512"
+-CREATEREPO_GENERAL_COMPRESS_TYPE: str = "zstd"
++CREATEREPO_CHECKSUM_TYPE: str = "sha256"
++CREATEREPO_GENERAL_COMPRESS_TYPE: str = "gz"