Sync from SUSE:SLFO:Main product-composer revision fcf3f0324e202488b4e18eb254b14c6d

This commit is contained in:
Adrian Schröter 2024-08-06 11:57:52 +02:00
parent f63f84c733
commit da528f31a5
7 changed files with 110 additions and 20 deletions

View File

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

BIN
product-composer-0.4.16.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

BIN
product-composer-0.4.8.obscpio (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
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>
- update to version 0.4.9
* Introduce "extension" product-type as alias for "module"
Technical the same, but handled different in user accounting
* fix for building without debug or source media
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 24 13:54:21 UTC 2024 - Adrian Schröter <adrian@suse.de> Fri May 24 13:54:21 UTC 2024 - Adrian Schröter <adrian@suse.de>
@ -104,7 +158,7 @@ Tue Dec 5 14:46:55 UTC 2023 - Adrian Schröter <adrian@suse.de>
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 4 15:27:14 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org> Mon Dec 4 15:27:14 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Set service to manaul run: server side execution not permitted in - Set service to manual run: server side execution not permitted in
products. products.
- Do not use python-single-spec magic, but use python3 directly - Do not use python-single-spec magic, but use python3 directly
(the main python version). (the main python version).

View File

@ -1,4 +1,4 @@
name: product-composer name: product-composer
version: 0.4.8 version: 0.4.16
mtime: 1716558739 mtime: 1721648773
commit: c83a1737ac73d82d1ac9f4ce6115323c36b39f5e commit: 67f801acc5f2059760c7d1d43b265f4817c64e5d

View File

@ -16,27 +16,36 @@
# #
%if "%{?sle_version}" == "150600"
%define used_python python311
%else
%define used_python python3
%endif
Name: product-composer Name: product-composer
Version: 0.4.8 Version: 0.4.16
Release: 0 Release: 0
Summary: Product Composer Summary: Product Composer
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Development/Tools/Building Group: Development/Tools/Building
URL: https://github.com/openSUSE/product-composer URL: https://github.com/openSUSE/product-composer
Source: %name-%{version}.tar.xz 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 # build for signdummy
Requires: build Requires: build
Requires: checkmedia Requires: checkmedia
Requires: createrepo Requires: createrepo_c
Requires: inst-source-utils Requires: inst-source-utils
Requires: libsolv-tools
Requires: mkisofs Requires: mkisofs
BuildArch: noarch 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. likely to break with productcompose file syntax changes.
%prep %prep
%autosetup -n %name-%version -p1 %setup -q -n %name-%version
%if "%{?sle_version}" == "150600"
%patch -P 1 -p1
%endif
%build %build
%if "%{?sle_version}" == "150600"
%python311_pyproject_wheel
%else
%python3_pyproject_wheel %python3_pyproject_wheel
%endif
%install %install
%if "%{?sle_version}" == "150600"
%python311_pyproject_install
%else
%python3_pyproject_install %python3_pyproject_install
%endif
mv %buildroot/usr/bin/productcomposer %buildroot%_bindir/product-composer mv %buildroot/usr/bin/productcomposer %buildroot%_bindir/product-composer
%files %files
%doc README.rst docs examples %doc README.rst docs examples
%_bindir/product-composer %_bindir/product-composer
%if "%{?sle_version}" == "150600"
%{python311_sitelib}/*
%else
%{python3_sitelib}/* %{python3_sitelib}/*
%endif
%changelog %changelog

12
sle-15-defaults.patch Normal file
View File

@ -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"