Hello community,
here is the log from the commit of package obs-service-product_converter for
openSUSE:Factory checked in at 2019-10-16 09:17:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-product_converter (Old)
and /work/SRC/openSUSE:Factory/.obs-service-product_converter.new.2352
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-product_converter"
Wed Oct 16 09:17:25 2019 rev:9 rq:738444 version:1.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-product_converter/obs-service-product_converter.changes
2019-02-27 15:08:49.566398106 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-product_converter.new.2352/obs-service-product_converter.changes
2019-10-16 09:17:27.995130267 +0200
@@ -1,0 +2,7 @@
+Mon Oct 14 14:34:56 UTC 2019 - Adrian Schröter <[email protected]>
+
+- 1.3.0
+ - no more migration spec files got created (supposed to be obsolete)
+ - extend summary: with possible defined beta version
+
+-------------------------------------------------------------------
Old:
----
obs-service-product_converter-1.2.0.obscpio
New:
----
obs-service-product_converter-1.3.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-product_converter.spec ++++++
--- /var/tmp/diff_new_pack.2CPqqf/_old 2019-10-16 09:17:29.555126247 +0200
+++ /var/tmp/diff_new_pack.2CPqqf/_new 2019-10-16 09:17:29.559126236 +0200
@@ -19,7 +19,7 @@
%define service product_converter
Name: obs-service-%service
-Version: 1.2.0
+Version: 1.3.0
Release: 0
Summary: An OBS source service: create product media build descriptions
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2CPqqf/_old 2019-10-16 09:17:29.591126153 +0200
+++ /var/tmp/diff_new_pack.2CPqqf/_new 2019-10-16 09:17:29.591126153 +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.2.0</param>
- <param name="revision">1.2.0</param>
+ <param name="version">1.3.0</param>
+ <param name="revision">1.3.0</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="buildtime"/>
++++++ obs-service-product_converter-1.2.0.obscpio ->
obs-service-product_converter-1.3.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-product_converter-1.2.0/create_single_product
new/obs-service-product_converter-1.3.0/create_single_product
--- old/obs-service-product_converter-1.2.0/create_single_product
2019-01-30 14:50:02.000000000 +0100
+++ new/obs-service-product_converter-1.3.0/create_single_product
2019-10-14 16:33:57.000000000 +0200
@@ -767,77 +767,6 @@
return $reame_file;
}
-sub writeMigrationSPECfile( $$$$$ )
-{
- my( $file, $prodRef, $product, $newpatchlevel, $migtarget ) = @_;
- my $mproduct = Storable::dclone($product);
- undef $mproduct->{summary};
- undef $mproduct->{shortsummary};
-
- if ($migtarget) {
- $mproduct->{name} = $product->{name}."-".$migtarget."-migration";
- } else {
- $mproduct->{name} = $product->{name}."-SP".$newpatchlevel."-migration";
- }
-
- # Upgrade section must not be in migration to avoid double notification
- delete $mproduct->{upgrades};
-
- # Set default values for release package reference
- $mproduct->{'installconfig'}->{'releasepackage'} = { 'flag' => "EQ" };
- $mproduct->{'installconfig'}->{'releasepackage'}->{'name'} = '%{name}';
- $mproduct->{'installconfig'}->{'releasepackage'}->{'version'} =
'%{version}';
- $mproduct->{'installconfig'}->{'releasepackage'}->{'release'} =
'%{release}';
-
- my $content="# ";
- $content.="\n\n";
-
- my $package_name = $mproduct->{name};
- $package_name =~ s/\./_/g;
- $content.="Name: $package_name\n";
-
- my $sum_str = "";
- if ($migtarget) {
- $sum_str = "$product->{name} $migtarget Migration Product";
- } else {
- $sum_str = "$product->{name} Service Pack $newpatchlevel Migration
Product";
- }
- $content.="Summary: $sum_str\n";
- push @{$mproduct->{summary}}, { '_content' => $sum_str };
- push @{$mproduct->{shortsummary}}, { '_content' => $sum_str };
-
- $content.="Version: ".$product->{version}."\n";
- $content.="Release: 0\n";
- $content.="License: BSD-3-Clause\n";
- $content.="Group: System/Fhs\n";
- $content.="Provides: product()\n";
- $content.="Provides: product(".$mproduct->{name}.") =
%{version}-%{release}\n";
- $content.="Requires: product(".$product->{name}.") =
".$product->{version}."\n";
- $content.="AutoReqProv: on\n";
- $content.="BuildRoot: %{_tmppath}/%{name}-%{version}-build\n";
- $content.="\n%description\n";
- if ($migtarget) {
- $content.="Product to migrate to $product->{name} $migtarget.\n";
- } else {
- $content.="Product to migrate to $product->{name} Service Pack
$newpatchlevel.\n";
- }
- $content.="\n\n";
- $content.="\n%prep\n";
- $content.="\n%build\n\n";
- $content.="\n%install\n";
- $content.=createProductFile($prodRef,$mproduct);
- $content.="\n%clean\n";
- $content.="rm -rf %buildroot\n";
- $content.="\n%files\n";
- $content.="%defattr(644,root,root,755)\n";
- $content.="%dir /etc/products.d\n";
- $content.="/etc/products.d/*.prod\n";
- $content.="\n%changelog\n";
-
- # write out the modified file.
- writestr($file, undef, $content);
-}
-
sub escapeProvides($)
{
my( $string ) = @_;
@@ -983,7 +912,7 @@
$str.="%define betaversion
$product->{'buildconfig'}->{'betaversion'}\n";
}
foreach my $summary ( @{$product->{'summary'}} ){
- $str.="Summary: $summary->{_content}\n" if ( !
$summary->{'language'} );
+ $str.="Summary: $summary->{_content}%{?betaversion:
%{betaversion}}\n" if ( ! $summary->{'language'} );
}
$str.="Version: ".$product->{version}."\n";
$str.="Release: 0\n"; # FIXME: check if this is this really
handled via BS
@@ -1112,7 +1041,7 @@
$product_flavors.=createProductDependencyLines($flavor->{'productdependency'});
}
foreach my $summary ( @{$product->{'summary'}} ){
- $product_flavors.="Summary: $summary->{_content}\n" if ( !
$summary->{'language'} );
+ $product_flavors.="Summary: $summary->{_content}%{?betaversion:
%{betaversion}}\n" if ( ! $summary->{'language'} );
}
$product_flavors.="\n";
$product_flavors.="%description $flavor->{flavor}\n";
@@ -1392,34 +1321,6 @@
#
# Create $product-release packages
#
-
-# handle migration case
-if (defined($product->{migrationtarget})){
- my $newpatchlevel = 0;
- my $productname =
$product->{name}."-".$product->{migrationtarget}."-migration";
- # enforce correct upgrade product name
- for my $upgrade ( @{$product->{upgrades}->{upgrade}||[]} ) {
- $upgrade->{name} = $productname;
- $upgrade->{product} = $productname;
- }
- my $packagename = $productname;
- $packagename =~ s/\./_/g;
- writeMigrationSPECfile( "$outdir/".$packagename.".spec",
- $prodRef, $product, $newpatchlevel,
$product->{migrationtarget} );
-} elsif (defined($product->{patchlevel})){
- my $newpatchlevel = $product->{'patchlevel'} + 1;
- my $productname = $product->{name}."-SP".$newpatchlevel."-migration";
-
- # enforce correct upgrade product name
- for my $upgrade ( @{$product->{upgrades}->{upgrade}||[]} ) {
- $upgrade->{name} = $productname;
- $upgrade->{product} = $productname;
- }
-
- writeMigrationSPECfile( "$outdir/".$productname.".spec",
- $prodRef, $product, $newpatchlevel, undef);
-}
-
my $SPECtemplateFile;
if ($infile =~ /(.*\/)(.+)$/) {
# not using $product->{releasepkgname} for compatibility reasons
++++++ obs-service-product_converter.obsinfo ++++++
--- /var/tmp/diff_new_pack.2CPqqf/_old 2019-10-16 09:17:29.699125875 +0200
+++ /var/tmp/diff_new_pack.2CPqqf/_new 2019-10-16 09:17:29.703125865 +0200
@@ -1,5 +1,5 @@
name: obs-service-product_converter
-version: 1.2.0
-mtime: 1548856202
-commit: c222f643ba0b40d8a15a90e38e33064b9f57d165
+version: 1.3.0
+mtime: 1571063637
+commit: 32a93c80ec5c8ce5af88a392d7cb04a48f5d27ce
