Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package obs-service-product_converter for
openSUSE:Factory checked in at 2022-10-11 18:03:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-product_converter (Old)
and /work/SRC/openSUSE:Factory/.obs-service-product_converter.new.2275
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-product_converter"
Tue Oct 11 18:03:39 2022 rev:20 rq:1009817 version:1.5.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-product_converter/obs-service-product_converter.changes
2021-10-07 13:42:52.076894493 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-product_converter.new.2275/obs-service-product_converter.changes
2022-10-11 18:06:02.210132046 +0200
@@ -1,0 +2,26 @@
+Tue Oct 11 14:21:43 UTC 2022 - Adrian Schr??ter <[email protected]>
+
+- 1.5.3
+ * fixed encoding of product provides
+ * revert fix use_undecided="true" special case
+
+-------------------------------------------------------------------
+Wed Nov 10 08:16:49 UTC 2021 - Adrian Schr??ter <[email protected]>
+
+- 1.5.2
+ * transport module informations
+ * allow to specify a DVD volume ID manual
+
+-------------------------------------------------------------------
+Fri Sep 24 15:42:24 UTC 2021 - Adrian Schr??ter <[email protected]>
+
+- 1.5.0
+ * support run_depenendency_check="warn" or ="error"
+
+-------------------------------------------------------------------
+Wed Sep 22 07:45:50 UTC 2021 - Adrian Schr??ter <[email protected]>
+
+- 1.4.9
+ * fix use_undecided="true" special case
+
+-------------------------------------------------------------------
Old:
----
obs-service-product_converter-1.4.8.obscpio
New:
----
obs-service-product_converter-1.5.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-product_converter.spec ++++++
--- /var/tmp/diff_new_pack.pXz3zw/_old 2022-10-11 18:06:02.622132711 +0200
+++ /var/tmp/diff_new_pack.pXz3zw/_new 2022-10-11 18:06:02.646132750 +0200
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define service product_converter
Name: obs-service-%service
-Version: 1.4.8
+Version: 1.5.3
Release: 0
Summary: An OBS source service: create product media build descriptions
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.pXz3zw/_old 2022-10-11 18:06:02.678132802 +0200
+++ /var/tmp/diff_new_pack.pXz3zw/_new 2022-10-11 18:06:02.682132808 +0200
@@ -2,8 +2,8 @@
<service name="obs_scm" mode="manual">
<param
name="url">https://github.com/openSUSE/obs-service-product_converter.git</param>
<param name="scm">git</param>
- <param name="version">1.4.8</param>
- <param name="revision">1.4.8</param>
+ <param name="version">1.5.3</param>
+ <param name="revision">1.5.3</param>
</service>
<service name="set_version" mode="manual"/>
<service name="tar" mode="buildtime"/>
++++++ obs-service-product_converter-1.4.8.obscpio ->
obs-service-product_converter-1.5.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-product_converter-1.4.8/BSKiwiXML.pm
new/obs-service-product_converter-1.5.3/BSKiwiXML.pm
--- old/obs-service-product_converter-1.4.8/BSKiwiXML.pm 2021-09-08
15:33:14.000000000 +0200
+++ new/obs-service-product_converter-1.5.3/BSKiwiXML.pm 2022-10-11
16:31:34.000000000 +0200
@@ -299,7 +299,7 @@
[[ 'repopackage' =>
'name',
'addarch', 'arch', 'baselibs_arch',
- 'forcearch','removearch', 'onlyarch', 'source', 'script',
'medium', 'priority'
+ 'forcearch','removearch', 'onlyarch', 'source', 'script',
'medium', 'module', 'priority'
]],
]],
[ 'driverupdate' =>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-product_converter-1.4.8/BSProductXML.pm
new/obs-service-product_converter-1.5.3/BSProductXML.pm
--- old/obs-service-product_converter-1.4.8/BSProductXML.pm 2021-09-08
15:33:14.000000000 +0200
+++ new/obs-service-product_converter-1.5.3/BSProductXML.pm 2022-10-11
16:31:34.000000000 +0200
@@ -90,6 +90,7 @@
# Defines a single product, will be used in installed system to indentify it
our $product = [
'product' =>
+ 'id', # obsolete, do not use anymore
'schemeversion',
[],
'vendor',
@@ -123,8 +124,8 @@
'name',
'medium',
'url', # this conflicts with project/name/medium
- $zypp,
'arch', # for arch specific definitions
+ $zypp,
]],
],
[ 'updates' =>
@@ -136,17 +137,24 @@
[[ 'repository' =>
'project', # input
'name',
+ 'repoid', # output for .prod file
+ 'url', # this conflicts with project/name/medium
'arch', # for arch specific definitions
$zypp,
]],
],
+ [ 'repositories' =>
+ [[ 'repository' =>
+ 'path',
+ ]],
+ ], # this is for prod file export only, not used for SLE
12/openSUSE 13.2 media style anymore
],
[ 'repositories' =>
[[ 'repository' =>
'type',
'repoid',
]],
- ], # this is for prod file export only
+ ], # this is for prod file export only since Leap 15
[ 'upgrades' => # to announce service pack releases
[[ 'upgrade' =>
[],
@@ -191,7 +199,7 @@
[],
'producttheme',
'betaversion',
- 'milestone', # alternative to betaversion for stable releases
+ 'milestone', # alternative to betaversion, not causing a beta
warning
'mainproduct',
'create_flavors',
[ 'linguas' =>
@@ -206,8 +214,8 @@
'defaultlang',
'datadir',
'descriptiondir',
- 'default_obs_repository_name',
- 'default_obs_download_url',
+ 'default_obs_repository_name', # needs to be a sync with the
name in /distributions
+ 'default_obs_download_url', # contains %_download_url
[ 'releasepackage' => 'name', 'flag', 'version', 'release' ],
'distribution',
[[ 'obsoletepackage' => '_content' ]],
@@ -258,7 +266,7 @@
[[ 'repository' =>
'path',
'build',
- 'product_file'
+ 'product_file',
]],
],
[ 'archsets' =>
@@ -278,8 +286,10 @@
'repo_only', # do not create iso files
'drop_repo', # remove trees, just having iso
files as result
'mediastyle',
+ 'volumeid', # non standard volume id inside of
iso files
'firmware',
'registration',
+ 'create_repomd', # old format only
'sourcemedia',
'debugmedia',
'separate',
@@ -295,9 +305,13 @@
'use_required',
'use_undecided', # take all packages, even the ungrouped ones
'use_newest_version', # rpm version compare instead of repository
priority
+ 'run_dependency_check', # set either to "warn" or "error"
'allow_overflow',
'next_media_in_set',
+ 'separate',
'size',
+ 'datadir', # old format only
+ 'descriptiondir', # old format only
[[ 'preselected_patterns' =>
[[ 'pattern' =>
'name',
@@ -314,7 +328,7 @@
'use_suggested',
'use_required',
'create_pattern',
- [[ 'package' => 'name', 'medium', 'relationship', 'arch',
'addarch' ]],
+ [[ 'package' => 'name', 'medium', 'module', 'relationship',
'arch', 'addarch' ]],
[[ 'include' => 'group', 'relationship' ]],
]],
# product dependency got moved to product definition
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-product_converter-1.4.8/create_single_product
new/obs-service-product_converter-1.5.3/create_single_product
--- old/obs-service-product_converter-1.4.8/create_single_product
2021-09-08 15:33:14.000000000 +0200
+++ new/obs-service-product_converter-1.5.3/create_single_product
2022-10-11 16:31:34.000000000 +0200
@@ -266,6 +266,9 @@
if ( defined $medium->{'name'} ) {
$varsH{MEDIUM_NAME} = $medium->{'name'}."-".join( "-", @allarchs );
}
+ if ( defined $medium->{'volumeid'} ) {
+ $varsH{VOLUME_ID} = $medium->{'volumeid'};
+ }
$varsH{PRODUCT_THEME} = $product->{'buildconfig'}->{'producttheme'};
$varsH{SEPARATE_MEDIA} = "true" unless (defined($medium->{'separate'}) &&
$medium->{'separate'} eq 'false');
$varsH{MULTIPLE_MEDIA} = "false";
@@ -321,6 +324,7 @@
$options{'INI_DIR'} = "/usr/share/kiwi/modules/plugins/$mediaStyle";
$options{'BETA_VERSION'} = $product->{'buildconfig'}->{'betaversion'} if
(defined($product->{'buildconfig'}->{'betaversion'}));
$options{'MAIN_PRODUCT'} = $product->{'buildconfig'}->{'mainproduct'} if
(defined($product->{'buildconfig'}->{'mainproduct'}));
+ $options{'RUN_DEPENDENCY_CHECK'} = $medium->{'run_dependency_check'} if
defined($medium->{'run_dependency_check'});
my %info;
$info{'VENDOR'} = $product->{'vendor'};
@@ -493,7 +497,6 @@
# there might be additional packages listed in the group.
if( $useState->{package} ) {
foreach my $addPack ( @{$useState->{package} } ) {
- # print Dumper( $addPack ) . "\n";
my $relType = $addPack->{relationship};
die( "ERROR: Unknown relation type string for package
add!\n" ) unless( $relType eq "requires" || $relType eq "recommends" ||
$relType eq "suggests" );
if( ( $useRequired && $addPack->{relationship} eq
"requires") ||
@@ -503,6 +506,7 @@
my %tmp;
$tmp{name} = $addPack->{name};
$tmp{medium} = $addPack->{medium} if
(defined($addPack->{medium}));
+ $tmp{module} = $addPack->{module} if
(defined($addPack->{module}));
if ($addPack->{removearch}) {
next if containsMyArch( $prodRef, $archSetList,
$addPack->{removearch} );
$tmp{removearch} = $addPack->{removearch};
@@ -678,8 +682,8 @@
$packValues{name} = $packRef->{name};
if( $groupRef->{platform} ) {
# forcerepo??
- foreach my $tag ('forcearch', 'addarch', 'onlyarch',
'removearch', 'source', 'script', 'medium' ) {
- $packValues{$tag} = $groupRef->{platform}->{$tag} if(
$groupRef->{platform}->{$tag} );
+ foreach my $tag ('forcearch', 'addarch', 'onlyarch',
'removearch', 'source', 'script', 'medium', 'module' ) {
+ $packValues{$tag} = $groupRef->{platform}->{$tag} if
$groupRef->{platform}->{$tag};
}
}
@@ -813,7 +817,13 @@
die("product register flavor with invalid content") if
defined($product->{register}->{flavor}) &&
$product->{register}->{flavor} ne 'module' &&
$product->{register}->{flavor} ne 'extension';
die("product release is not set but required") unless
defined($product->{release}) and $product->{release} ne "";
- $productprovides.="Provides: product() = $product->{name}\n";
+ if ($product->{name} =~ /.*-.*-.*/) {
+ # it should be always encoded that way, but ..
+ $productprovides.="Provides: product() =
".escapeProvides($product->{name})."\n";
+ } else {
+ # ... to stay backward compatible
+ $productprovides.="Provides: product() = $product->{name}\n";
+ }
$productprovides.="Provides: product(".$product->{name}.") =
$product->{version}-$product->{release}\n";
foreach my $r ( @{$product->{register}->{pool}->{repository}} ) {
if ($r->{'url'}) {
@@ -917,6 +927,7 @@
$str.="Release: 0\n"; # FIXME: check if this is this really
handled via BS
$str.="License: BSD-3-Clause\n";
$str.="Group: System/Fhs\n";
+ $str.="%global debug_package %{nil}\n";
$str.=$obsoletepackage;
$str.=$productprovides;
$str.="\n___PRODUCT_DEPENDENCIES___\n";
@@ -1472,7 +1483,6 @@
my $outFile = "$outdir/$file.kiwi";
my $supportFile= "$outdir/$file.kwd";
-
writexml( "$outFile$$", $outFile, $kiwi, $BSKiwiXML::kiwidesc );
if ( defined($product->{buildconfig}->{milestone}) ) {
open(FH, ">>", $outFile) or die "Unable to open file $outFile";
++++++ obs-service-product_converter.obsinfo ++++++
--- /var/tmp/diff_new_pack.pXz3zw/_old 2022-10-11 18:06:02.826133041 +0200
+++ /var/tmp/diff_new_pack.pXz3zw/_new 2022-10-11 18:06:02.830133048 +0200
@@ -1,6 +1,5 @@
name: obs-service-product_converter
-version: 1.4.8
-mtime: 1631107994
-commit: 0e82b8ff94c591f3a231aadebd3caa55a6c148f8
-
+version: 1.5.3
+mtime: 1665498694
+commit: 0503b6444b09ce3094f96c2f5ffde034ba9ba3ba
