Hello community,
here is the log from the commit of package obs-service-product_converter for
openSUSE:Factory checked in at 2020-07-03 00:14:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-product_converter (Old)
and /work/SRC/openSUSE:Factory/.obs-service-product_converter.new.3060
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-product_converter"
Fri Jul 3 00:14:16 2020 rev:10 rq:818335 version:1.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-product_converter/obs-service-product_converter.changes
2019-10-16 09:17:27.995130267 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-product_converter.new.3060/obs-service-product_converter.changes
2020-07-03 00:17:43.545122870 +0200
@@ -1,0 +2,8 @@
+Tue Jun 23 14:36:20 UTC 2020 - Adrian Schröter <[email protected]>
+
+- 1.4.0
+ - obsolete and conflict predecessor flavors
+ - Avoid Duplicate Repository Entries in .prod file
+ - If defined build a ExclusiveArch list from 'distrotarget'
+
+-------------------------------------------------------------------
Old:
----
obs-service-product_converter-1.3.0.obscpio
New:
----
obs-service-product_converter-1.4.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-product_converter.spec ++++++
--- /var/tmp/diff_new_pack.Zbvzji/_old 2020-07-03 00:17:45.333128800 +0200
+++ /var/tmp/diff_new_pack.Zbvzji/_new 2020-07-03 00:17:45.333128800 +0200
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-product_converter
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
%define service product_converter
Name: obs-service-%service
-Version: 1.3.0
+Version: 1.4.0
Release: 0
Summary: An OBS source service: create product media build descriptions
License: GPL-2.0-or-later
Group: Development/Tools/Building
-Url: https://github.com/openSUSE/obs-service-%{service}
+URL: https://github.com/openSUSE/obs-service-%{service}
Source: %name-%{version}.tar.xz
BuildArch: noarch
BuildRequires: perl(XML::Structured)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Zbvzji/_old 2020-07-03 00:17:45.361128893 +0200
+++ /var/tmp/diff_new_pack.Zbvzji/_new 2020-07-03 00:17:45.365128906 +0200
@@ -2,8 +2,8 @@
<service name="obs_scm" mode="disabled">
<param
name="url">https://github.com/openSUSE/obs-service-product_converter.git</param>
<param name="scm">git</param>
- <param name="version">1.3.0</param>
- <param name="revision">1.3.0</param>
+ <param name="version">1.4.0</param>
+ <param name="revision">1.4.0</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="buildtime"/>
++++++ obs-service-product_converter-1.3.0.obscpio ->
obs-service-product_converter-1.4.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-product_converter-1.3.0/create_single_product
new/obs-service-product_converter-1.4.0/create_single_product
--- old/obs-service-product_converter-1.3.0/create_single_product
2019-10-14 16:33:57.000000000 +0200
+++ new/obs-service-product_converter-1.4.0/create_single_product
2020-06-23 16:34:19.000000000 +0200
@@ -923,6 +923,12 @@
$str.="\n___PRODUCT_DEPENDENCIES___\n";
$str.="AutoReqProv: on\n";
$str.="BuildRoot: %{_tmppath}/%{name}-%{version}-build\n";
+ if (defined($product->{register}->{updates}->{distrotarget})) {
+ $str.="# this package should only be available for the \"basearchs\"
of a product\nExclusiveArch:";
+ foreach my $dt ( @{$product->{register}->{updates}->{distrotarget}} ) {
+ $str.=" $dt->{arch}";
+ }
+ }
$str.="\n%description\n";
for my $description ( @{$product->{'description'} || []} ){
$str.="$description->{_content}\n" if ( !
$description->{'description'} );
@@ -1030,6 +1036,10 @@
}
$product_flavors.="Provides: product_flavor()\n";
$product_flavors.="Provides: flavor($flavor->{flavor})\n";
+ foreach my $predecessor ( @{$product->{'predecessor'}} ){
+ $product_flavors.="Obsoletes:
$predecessor-release-$flavor->{flavor}\n";
+ $product_flavors.="Conflicts:
$predecessor-release-$flavor->{flavor}\n";
+ }
if (defined($flavor->{'preselected_patterns'})){
$product_flavors.=createPreSelectPatternDeps($flavor->{'preselected_patterns'});
}
@@ -1210,9 +1220,13 @@
}
push @r, { 'type' => 'update', "repoid" => $obsurl };
};
+ my %seen_obsurl;
foreach my $repo ( @{$product->{register}->{pool}->{repository}} ) {
next unless defined($repo->{name});
my $obsurl =
"obsproduct://$obsname/$repo->{project}/$product->{name}/$product->{version}/%{_target_cpu}";
+ my $uniq_obsurl = $obsurl . ($repo->{arch}? "$repo->{arch}" : "");
+ next if defined($seen_obsurl{$uniq_obsurl});
+ $seen_obsurl{$uniq_obsurl} = 1;
if ($repo->{zypp}) {
die("400 zypp lacks alias attribute") unless $repo->{zypp}->{alias};
die("400 zypp lacks name attribute") unless $repo->{zypp}->{name};
++++++ obs-service-product_converter.obsinfo ++++++
--- /var/tmp/diff_new_pack.Zbvzji/_old 2020-07-03 00:17:45.453129197 +0200
+++ /var/tmp/diff_new_pack.Zbvzji/_new 2020-07-03 00:17:45.453129197 +0200
@@ -1,5 +1,5 @@
name: obs-service-product_converter
-version: 1.3.0
-mtime: 1571063637
-commit: 32a93c80ec5c8ce5af88a392d7cb04a48f5d27ce
+version: 1.4.0
+mtime: 1592922859
+commit: 066e164012e954383204d56a8137abb470b28f61
