commit obs-service-product_converter for openSUSE:Factory

1 Jul 2021

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 2021-07-01 07:05:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-product_converter (Old)
 and      /work/SRC/openSUSE:Factory/.obs-service-product_converter.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "obs-service-product_converter"

Thu Jul  1 07:05:36 2021 rev:15 rq:903181 version:1.4.6

Changes:
--------

--- /work/SRC/openSUSE:Factory/obs-service-product_converter/obs-service-product_converter.changes	2020-11-13 19:00:39.858221138 +0100
+++ /work/SRC/openSUSE:Factory/.obs-service-product_converter.new.2625/obs-service-product_converter.changes	2021-07-01 07:05:47.919400117 +0200
@@ -1,0 +2,9 @@
+Wed Jun 30 06:16:44 UTC 2021 - Adrian Schr��ter <adrian@suse.de>
+
+- 1.4.6
+  * add a field for build.opensuse.org default repository name for 
+    zypper (bsc#1187425)
+  * add an automatic field for default OBS download URL
+  * release spec file cleanup
+
+-------------------------------------------------------------------

Old:
----
  obs-service-product_converter-1.4.5.obscpio

New:
----
  obs-service-product_converter-1.4.6.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ obs-service-product_converter.spec ++++++
--- /var/tmp/diff_new_pack.32IrYr/_old	2021-07-01 07:05:48.407396305 +0200
+++ /var/tmp/diff_new_pack.32IrYr/_new	2021-07-01 07:05:48.411396274 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package obs-service-product_converter
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 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.5
+Version:        1.4.6
 Release:        0
 Summary:        An OBS source service: create product media build descriptions
 License:        GPL-2.0-or-later

++++++ _service ++++++
--- /var/tmp/diff_new_pack.32IrYr/_old	2021-07-01 07:05:48.439396055 +0200
+++ /var/tmp/diff_new_pack.32IrYr/_new	2021-07-01 07:05:48.443396024 +0200
@@ -1,11 +1,11 @@
 <services>
-  <service name="obs_scm" mode="disabled">
+  <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.5</param>
-    <param name="revision">1.4.5</param>
+    <param name="version">1.4.6</param>
+    <param name="revision">1.4.6</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>

++++++ obs-service-product_converter-1.4.5.obscpio -> obs-service-product_converter-1.4.6.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-product_converter-1.4.5/BSProductXML.pm new/obs-service-product_converter-1.4.6/BSProductXML.pm
--- old/obs-service-product_converter-1.4.5/BSProductXML.pm	2020-11-10 17:37:22.000000000 +0100
+++ new/obs-service-product_converter-1.4.6/BSProductXML.pm	2021-06-30 09:32:39.000000000 +0200
@@ -206,6 +206,8 @@
               'defaultlang',
               'datadir',
               'descriptiondir',
+              'default_obs_repository_name',
+              'default_obs_download_url',
               [ 'releasepackage' => 'name', 'flag', 'version', 'release' ],
               'distribution',
               [[ 'obsoletepackage' => '_content' ]],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-product_converter-1.4.5/create_single_product new/obs-service-product_converter-1.4.6/create_single_product
--- old/obs-service-product_converter-1.4.5/create_single_product	2020-11-10 17:37:22.000000000 +0100
+++ new/obs-service-product_converter-1.4.6/create_single_product	2021-06-30 09:32:39.000000000 +0200
@@ -758,7 +758,7 @@
     foreach my $flavor ( @{$prodRef->{mediasets}->{media}} ){
       next if !defined($flavor->{'flavor'}) || $flavor->{'flavor'} eq '' || $seen{$flavor->{flavor}};
       $seen{$flavor->{flavor}} = 1;
-      my $readmedir = "\$RPM_BUILD_ROOT/%{_defaultdocdir}/$product->{releasepkgname}-$flavor->{flavor}";
+      my $readmedir = "%{buildroot}%{_defaultdocdir}/$product->{releasepkgname}-$flavor->{flavor}";
       $reame_file .= "mkdir -p $readmedir\n";
       $reame_file .= "cat >$readmedir/README << EOF\n";
       $reame_file .= "This package only exists for providing the product flavor \'$flavor->{flavor}\'.\n";
@@ -922,7 +922,6 @@
       $str.=$productprovides;
       $str.="\n___PRODUCT_DEPENDENCIES___\n";
       $str.="AutoReqProv:    on\n";
-      $str.="BuildRoot:      %{_tmppath}/%{name}-%{version}-build\n";
       if (defined($product->{register}->{updates}->{distrotarget}[0])) {
         $str.="# this package should only be available for the \"basearchs\" of a product\nExclusiveArch:";
         foreach my $dt ( @{$product->{register}->{updates}->{distrotarget}} ) {
@@ -941,13 +940,11 @@
       $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.="%dir %{_sysconfdir}/products.d\n";
+      $str.="%{_sysconfdir}/products.d/*.prod\n";
+#      $str.="%{_sysconfdir}/os-release\n";
       $str.="\n%changelog\n";
 
     } else {
@@ -1029,7 +1026,12 @@
     foreach my $flavor ( @{$prodRef->{mediasets}->{media}} ){
       next if !defined($flavor->{'flavor'}) || $flavor->{'flavor'} eq '' || $seen{$flavor->{flavor}};
       $seen{$flavor->{flavor}} = 1;
-      $product_flavors.="%package $flavor->{flavor}\n";
+      # not using $product->{releasepkgname} since it always be initialed
+      if (defined($prodRef->{'products'}->{'product'}[0]->{'releasepkgname'}) && $prodRef->{'products'}->{'product'}[0]->{'releasepkgname'} ne '') {
+          $product_flavors.="%package -n $prodRef->{'products'}->{'product'}[0]->{'releasepkgname'}-$flavor->{flavor}\n";
+      } else {
+          $product_flavors.="%package $flavor->{flavor}\n";
+      }
       $product_flavors.="License:        BSD-3-Clause\n";
       $product_flavors.="Group:          System/Fhs\n";
       if ((defined($prodRef->{'project'}->{'name'})) && ("$prodRef->{'project'}->{'name'}" ne "")){
@@ -1080,22 +1082,22 @@
                    $greeting = $summary->{'_content'} if ( ! $summary->{'language'} );
                 }
 
-                my $content="mkdir -p %{buildroot}/%{_sysconfdir}
-echo -e 'Welcome to ".$greeting." %{?betaversion:%{betaversion} }- Kernel \\r (\\l).\n\n' > %{buildroot}/etc/issue
-echo \"Welcome to ".$greeting." %{?betaversion:%{betaversion} }- Kernel %%r (%%t).\" > %{buildroot}/etc/issue.net
-echo \"#".$greeting." %{?betaversion:%{betaversion} }(%{_target_cpu})\" > %{buildroot}/etc/SuSE-release
-echo \"VERSION = %{version}\" >> %{buildroot}/etc/SuSE-release\n";
+                my $content="mkdir -p %{buildroot}%{_sysconfdir}
+echo -e 'Welcome to ".$greeting." %{?betaversion:%{betaversion} }- Kernel \\r (\\l).\n\n' > %{buildroot}%{_sysconfdir}/issue
+echo \"Welcome to ".$greeting." %{?betaversion:%{betaversion} }- Kernel %%r (%%t).\" > %{buildroot}%{_sysconfdir}/issue.net
+echo \"#".$greeting." %{?betaversion:%{betaversion} }(%{_target_cpu})\" > %{buildroot}%{_sysconfdir}/SuSE-release
+echo \"VERSION = %{version}\" >> %{buildroot}%{_sysconfdir}/SuSE-release\n";
 
                 $content.="PATCHLEVEL = ".$product->{'patchlevel'}."\n" if (defined($product->{'patchlevel'}));
-                $content.="mkdir -p %{buildroot}/%{_sysconfdir}
-echo \"Have a lot of fun...\" > %{buildroot}/etc/motd
-# Bug 404141 - /etc/YaST/control.xml should be owned by some package
-mkdir -p %{buildroot}/etc/YaST2/
-install -m 644 /CD1/control.xml %{buildroot}/etc/YaST2/
-install -m 644 -D /CD1/EULA.txt %{buildroot}/%{_docdir}/%{name}/%{product}-EULA.txt
+                $content.="mkdir -p %{buildroot}%{_sysconfdir}
+echo \"Have a lot of fun...\" > %{buildroot}%{_sysconfdir}/motd
+# Bug 404141 - %{_sysconfdir}/YaST/control.xml should be owned by some package
+mkdir -p %{buildroot}%{_sysconfdir}/YaST2/
+install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
+install -m 644 -D /CD1/EULA.txt %{buildroot}%{_docdir}/%{name}/%{product}-EULA.txt
 ";
 	}
-        $content="mkdir -p %{buildroot}/etc/products.d";
+        $content="mkdir -p %{buildroot}%{_sysconfdir}/products.d";
         return $content;
 }
 
@@ -1140,8 +1142,8 @@
 sub createOsReleaseFile ($) {
     my ($prodRef, $product) = @_;
     my $bugtracker=getUrl($product,"i586","bugtracker");
-    my $rfile = "\$RPM_BUILD_ROOT/etc/os-release";
-    my $os_release_file = "mkdir -p \$RPM_BUILD_ROOT/etc\n";
+    my $rfile = "%{buildroot}%{_sysconfdir}/os-release";
+    my $os_release_file = "mkdir -p %{buildroot}%{_sysconfdir}\n";
     $os_release_file .= "cat >$rfile << EOF\n";
     my $name = $product->{'name'};
     # shall we strip ^SUSE_ here or better modify the name in SLE 12?
@@ -1153,10 +1155,10 @@
     } else {
       $os_release_file .= "VERSION=\"%{version}";
     }
-    $os_release_file .= "%{?betaversion: }%{?betaversion}\"\n";
+    $os_release_file .= "%{?betaversion: %{betaversion}}\"\n";
 
     $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 .= "PRETTY_NAME=\"".$product->{'summary'}[0]->{_content}."%{?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
@@ -1173,14 +1175,14 @@
     # not wanted there
     delete $zypp_product->{'releasepkgname'};
     my $d;
-    my $pfile = "\$RPM_BUILD_ROOT/etc/products.d/$product->{name}.prod";
+    my $pfile = "%{buildroot}%{_sysconfdir}/products.d/$product->{name}.prod";
     if (defined($product->{'endoflife'})&& $product->{'endoflife'} ne "" 
         && !($product->{'endoflife'} =~ /^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/)) {
       die("400 endoflife not in ISO 8601 format (YYYY-MM-DD)");
     }
     my $mediaStyle = getMediaStyle($prodRef);
 
-    $zypp_product_file = "mkdir -p \$RPM_BUILD_ROOT/etc/products.d\n";
+    $zypp_product_file = "mkdir -p %{buildroot}%{_sysconfdir}/products.d\n";
     $zypp_product->{'arch'} = '%{_target_cpu}'; # write product architecture during rpm build
     $zypp_product->{'schemeversion'} = "0";
     my $cpe = getCpeId($prodRef, $product);
@@ -1313,6 +1315,11 @@
                 if ( not defined($product->{'installconfig'}->{'releasepackage'}->{'version'}) );
 $product->{'installconfig'}->{'releasepackage'}->{'release'} = '%{release}'
                 if ( not defined($product->{'installconfig'}->{'releasepackage'}->{'release'}) );
+if (defined($product->{'installconfig'}->{'default_obs_repository_name'})) {
+  # only for newer product files where a default name has been configured
+  $product->{'installconfig'}->{'default_obs_download_url'} = '%{_download_url}'
+                if ( not defined($product->{'installconfig'}->{'default_obs_download_url'}) );
+};
 
 #
 # Create a kiwi configuration for each distribution flavor

++++++ obs-service-product_converter.obsinfo ++++++
--- /var/tmp/diff_new_pack.32IrYr/_old	2021-07-01 07:05:48.563395086 +0200
+++ /var/tmp/diff_new_pack.32IrYr/_new	2021-07-01 07:05:48.567395056 +0200
@@ -1,5 +1,5 @@
 name: obs-service-product_converter
-version: 1.4.5
-mtime: 1605026242
-commit: fd03b71053a57ae8c5cda73588b04231cda7706d
+version: 1.4.6
+mtime: 1625038359
+commit: 629300c500a764806c83f3b4e77b1b1f93dc5355

    

Source-Sync

tags

participants (1)