Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package product-composer for
openSUSE:Factory checked in at 2024-04-12 17:34:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-composer (Old)
and /work/SRC/openSUSE:Factory/.product-composer.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-composer"
Fri Apr 12 17:34:11 2024 rev:10 rq:1166882 version:0.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-composer/product-composer.changes
2024-03-27 20:44:27.085287627 +0100
+++
/work/SRC/openSUSE:Factory/.product-composer.new.26366/product-composer.changes
2024-04-12 17:37:33.657886298 +0200
@@ -1,0 +2,8 @@
+Thu Apr 11 12:17:13 UTC 2024 - Adrian Schröter <[email protected]>
+
+- update to version 0.4.4
+ * supports also schema version 0.2 now
+ * supports specifing add-on media product builds (versus OS)
+ * supports overwriting package (from) information in updatinfo
+
+-------------------------------------------------------------------
Old:
----
product-composer-0.4.3.obscpio
New:
----
product-composer-0.4.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-composer.spec ++++++
--- /var/tmp/diff_new_pack.3QB6WM/_old 2024-04-12 17:37:34.725925633 +0200
+++ /var/tmp/diff_new_pack.3QB6WM/_new 2024-04-12 17:37:34.729925781 +0200
@@ -17,7 +17,7 @@
Name: product-composer
-Version: 0.4.3
+Version: 0.4.4
Release: 0
Summary: Product Composer
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.3QB6WM/_old 2024-04-12 17:37:34.753926665 +0200
+++ /var/tmp/diff_new_pack.3QB6WM/_new 2024-04-12 17:37:34.757926812 +0200
@@ -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.3</param>
- <param name="revision">0.4.3</param>
+ <param name="version">0.4.4</param>
+ <param name="revision">0.4.4</param>
</service>
<service name="set_version" mode="manual" />
<service name="tar" mode="buildtime" />
++++++ product-composer-0.4.3.obscpio -> product-composer-0.4.4.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-composer-0.4.3/docs/build_description.adoc
new/product-composer-0.4.4/docs/build_description.adoc
--- old/product-composer-0.4.3/docs/build_description.adoc 2024-03-27
17:23:44.000000000 +0100
+++ new/product-composer-0.4.4/docs/build_description.adoc 2024-04-11
15:45:04.000000000 +0200
@@ -3,10 +3,11 @@
=== minimal version
- product_compose_schema: 0.1
+ product_compose_schema: 0.2
vendor: I_and_myself
name: my_product
version: 1.0
+ product-type: module
architectures: [ x86_64 ]
@@ -80,6 +81,16 @@
The product version
+==== summary
+
+The product name in explaining words. It will be presented to the
+user on overview screens
+
+==== product-type
+
+Either 'base' for operation systems or 'module' for any product
+depending on any existing installation.
+
==== architectures
An array of the master architectures to be put into the repository.
@@ -175,3 +186,9 @@
Defines the company responsible for the content. Can be for example
openSUSE or SUSE. It is used by the install stack.
+==== set_updateinfo_from
+
+Can be set to replace the "from" attribute in updateinfo.xml files with a
fixed value.
+This is shown as patch provider by zypp stack. Otherwise the value stays, OBS
is setting
+the packager from _patchinfo file here by default.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-composer-0.4.3/examples/ftp.productcompose
new/product-composer-0.4.4/examples/ftp.productcompose
--- old/product-composer-0.4.3/examples/ftp.productcompose 2024-03-27
17:23:44.000000000 +0100
+++ new/product-composer-0.4.4/examples/ftp.productcompose 2024-04-11
15:45:04.000000000 +0200
@@ -1,15 +1,22 @@
# Our initial schema version. Be prepared that it breaks until we are
# in full production mode
-product_compose_schema: 0.1
+product_compose_schema: 0.2
vendor: openSUSE
name: Tumbleweed
version: 1.0
-
+product-type: base # or module
+# summary is the short product description as available in meta data
summary: openSUSE Tumbleweed
-description: >
- openSUSE Tumbleweed is the rolling distribution by the
- openSUSE.org project.
+
+# scc data has no effect to the build result, it is just managing data
+# for the infrastructure
+scc:
+ description: >
+ openSUSE Tumbleweed is the rolling distribution by the
+ openSUSE.org project.
+ # family: sl-micro
+ # free: false
iso:
publisher:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-composer-0.4.3/src/productcomposer/cli.py
new/product-composer-0.4.4/src/productcomposer/cli.py
--- old/product-composer-0.4.3/src/productcomposer/cli.py 2024-03-27
17:23:44.000000000 +0100
+++ new/product-composer-0.4.4/src/productcomposer/cli.py 2024-04-11
15:45:04.000000000 +0200
@@ -151,7 +151,7 @@
if 'product_compose_schema' not in yml:
die('missing product composer schema')
- if yml['product_compose_schema'] != 0 and yml['product_compose_schema'] !=
0.1:
+ if yml['product_compose_schema'] != 0 and yml['product_compose_schema'] !=
0.1 and yml['product_compose_schema'] != 0.2:
die(f"Unsupported product composer schema:
{yml['product_compose_schema']}")
if 'flavors' not in yml:
@@ -170,6 +170,8 @@
yml['summary'] = f['summary']
if 'version' in f:
yml['version'] = f['version']
+ if 'product-type' in f:
+ yml['product-type'] = f['product-type']
if 'architectures' not in yml or not yml['architectures']:
die("No architecture defined. Maybe wrong flavor?")
@@ -621,6 +623,9 @@
needed = False
parent = update.findall('pkglist')[0].findall('collection')[0]
+ if yml['set_updateinfo_from']:
+ update.set('from', yml['set_updateinfo_from'])
+
for pkgentry in parent.findall('package'):
src = pkgentry.get('src')
if os.path.exists(rpmdir + '/' + src):
@@ -685,10 +690,17 @@
product_summary = yml['summary'] or yml['name']
product_summary += " " + str(yml['version'])
+ product_type = '/o'
+ if 'product-type' in yml:
+ if yml['product-type'] == 'base':
+ product_type = '/o'
+ elif yml['product-type'] == 'module':
+ product_type = '/a'
+ else:
+ die('Undefined product-type')
cr = CreaterepoWrapper(directory=".")
cr.distro = product_summary
- # FIXME: /o is only for operating systems, we have nothing else atm
- cr.cpeid = f"cpe:/o:{yml['vendor']}:{yml['name']}:{yml['version']}"
+ cr.cpeid =
f"cpe:{product_type}:{yml['vendor']}:{yml['name']}:{yml['version']}"
cr.repos = repos
# cr.split = True
# cr.baseurl = "media://"
++++++ product-composer.obsinfo ++++++
--- /var/tmp/diff_new_pack.3QB6WM/_old 2024-04-12 17:37:34.853930347 +0200
+++ /var/tmp/diff_new_pack.3QB6WM/_new 2024-04-12 17:37:34.857930495 +0200
@@ -1,5 +1,5 @@
name: product-composer
-version: 0.4.3
-mtime: 1711556624
-commit: 9d603322cf53a81e4ad41c6e47ce04e902799828
+version: 0.4.4
+mtime: 1712843104
+commit: 6b8348ef1a43060b857ec8ed3accbbd7f44f49e0
