Hello community,
here is the log from the commit of package obs-service-product_converter for
openSUSE:Factory checked in at 2020-11-13 19:00:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-product_converter (Old)
and /work/SRC/openSUSE:Factory/.obs-service-product_converter.new.24930
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-product_converter"
Fri Nov 13 19:00:01 2020 rev:14 rq:848316 version:1.4.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-product_converter/obs-service-product_converter.changes
2020-10-05 19:36:00.805369493 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-product_converter.new.24930/obs-service-product_converter.changes
2020-11-13 19:00:39.858221138 +0100
@@ -1,0 +2,8 @@
+Thu Nov 12 07:27:13 UTC 2020 - Adrian Schröter <adr...@suse.de>
+
+- 1.4.5
+ * Write beta version to the pretty name of os-release file.
+ * drop it from VERSION_ID since space violate the format spec.
+ jsc#SLE-170001
+
+-------------------------------------------------------------------
Old:
----
obs-service-product_converter-1.4.4.obscpio
New:
----
obs-service-product_converter-1.4.5.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-product_converter.spec ++++++
--- /var/tmp/diff_new_pack.JUi6b2/_old 2020-11-13 19:00:40.394221806 +0100
+++ /var/tmp/diff_new_pack.JUi6b2/_new 2020-11-13 19:00:40.394221806 +0100
@@ -19,7 +19,7 @@
%define service product_converter
Name: obs-service-%service
-Version: 1.4.4
+Version: 1.4.5
Release: 0
Summary: An OBS source service: create product media build descriptions
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.JUi6b2/_old 2020-11-13 19:00:40.426221845 +0100
+++ /var/tmp/diff_new_pack.JUi6b2/_new 2020-11-13 19:00:40.430221851 +0100
@@ -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.4.4</param>
- <param name="revision">1.4.4</param>
+ <param name="version">1.4.5</param>
+ <param name="revision">1.4.5</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="buildtime"/>
++++++ obs-service-product_converter-1.4.4.obscpio ->
obs-service-product_converter-1.4.5.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-product_converter-1.4.4/create_single_product
new/obs-service-product_converter-1.4.5/create_single_product
--- old/obs-service-product_converter-1.4.4/create_single_product
2020-09-30 12:11:59.000000000 +0200
+++ new/obs-service-product_converter-1.4.5/create_single_product
2020-11-10 17:37:22.000000000 +0100
@@ -939,12 +939,15 @@
$str.="\n%build\n\n";
$str.="\n%install\n";
$str.="___CREATE_PRODUCT_FILES___\n";
+# we could do this by default for base products
+# $str.="___CREATE_OS_RELEASE_FILE___\n";
$str.="\n%clean\n";
$str.="rm -rf %buildroot\n";
$str.="\n%files\n";
$str.="%defattr(644,root,root,755)\n";
$str.="%dir /etc/products.d\n";
$str.="/etc/products.d/*.prod\n";
+# $str.="/etc/os-release\n";
$str.="\n%changelog\n";
} else {
@@ -1152,8 +1155,8 @@
}
$os_release_file .= "%{?betaversion: }%{?betaversion}\"\n";
- $os_release_file .= "VERSION_ID=\"%{version}%{?betaversion?:
}%{?betaversion}\"\n";
- $os_release_file .=
"PRETTY_NAME=\"".$product->{'summary'}[0]->{_content}."\"\n" if
$product->{'summary'};
+ $os_release_file .= "VERSION_ID=\"%{version}\"\n";
+ $os_release_file .=
"PRETTY_NAME=\"".$product->{'summary'}[0]->{_content}."%{?betaversion:
(}%{?betaversion}%{?betaversion:)}\"\n" if $product->{'summary'};
$os_release_file .= "BUG_REPORT_URL=\"".$bugtracker."\"\n" if $bugtracker;
$os_release_file .= "ID=\"".lc($name)."\"\n";
$os_release_file .= "ID_LIKE=\"suse\"\n"; # We assume that the system is
SuSE like when you use this converter
@@ -1161,7 +1164,6 @@
my $cpe = getCpeId($prodRef, $product);
$os_release_file .= "CPE_NAME=\"$cpe\"\n" if $cpe;
$os_release_file .= "EOF\n";
-
}
sub createProductFile ( $$ ) {
++++++ obs-service-product_converter.obsinfo ++++++
--- /var/tmp/diff_new_pack.JUi6b2/_old 2020-11-13 19:00:40.554222005 +0100
+++ /var/tmp/diff_new_pack.JUi6b2/_new 2020-11-13 19:00:40.554222005 +0100
@@ -1,5 +1,5 @@
name: obs-service-product_converter
-version: 1.4.4
-mtime: 1601460719
-commit: 1594d72711d57b45400e39409db7c3b7603307fb
+version: 1.4.5
+mtime: 1605026242
+commit: fd03b71053a57ae8c5cda73588b04231cda7706d
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
