packaging_rake_tasks 1.5.0 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ce3829c7375bbaa7fbae51f8dd2d048a5405f02b79a9847c2896e64b4b0bd3
-  data.tar.gz: 1f7d203a058da0ff9fc95bf4d76fa6e514bd1878801dc70963a12960b77f4d87
+  metadata.gz: b51c3cd7c0620ced6018b4efe708293083eec2426b21aa1eac2475f3a6375ecd
+  data.tar.gz: fbf59488ffb0527701ab74c2ef0e9774d7eccac73de402c846abf4fc8b4c8057
 SHA512:
-  metadata.gz: 83865577aedef1a4a9e02111e73b326db1f9a69040434b8ddbac38736fccfad1b54507f1fb84c1f8927e158b22fcf37e1be8f1aff024ee1fd5433e30dcac5f5c
-  data.tar.gz: cb5ddfdacab8e31f46e899b77941a9a295b140343d37bfd12c850ea72996368e9c2e6260b072de829773b048a7418960928011c38955ce876302e413482a6308
+  metadata.gz: ff56da780a5b28abc3e2722f414f7f9141f7c9a29d7c73eb631c3113d8c1301a8463c1be80a52f11d7e07ae8535e1a289a514473ff6ac894d66f2cb8968d8bab
+  data.tar.gz: 13215646f023675f0157fce2e8cec42c97cd1d3c56c00773f824b17d5ff2a2321926323a4d481ec48ceaca893a50d6dc0e04c7152e637b10ac4e39f9dd43f2bc

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.3

data/lib/tasks/build_dependencies.rake

@@ -20,19 +20,46 @@ require "shellwords"
 require "open3"
 
 namespace :build_dependencies do
-  def buildrequires
-    buildrequires = []
+  # Read the multi build targets from the "_multibuild" file.
+  # @return [Array<String>] list of multi build targets or empty Array if the
+  #   "_multibuild" file does not exist
+  def multibuild_flavors
+    flavors = []
 
-    config = Packaging::Configuration.instance
-    Dir.glob("#{config.package_dir}/*.spec").each do |spec_file|
-      # get the BuildRequires from the spec files, this also expands the RPM macros like %{rubygem}
-      # use Open3 as the command produces some bogus error messages on stderr even on success,
-      # but in case of error it provides a hint what failed
-      stdout, stderr, status = Open3.capture3("rpmspec", "-q", "--buildrequires", spec_file)
+    # parse the _multibuild XML file if it is present
+    mbfile = File.join(Packaging::Configuration.instance.package_dir, "_multibuild")
+    if File.exist?(mbfile)
+      require "rexml/document"
+      doc = REXML::Document.new(File.read(mbfile))
+      doc.elements.each("//multibuild/flavor | //multibuild/package") do |node|
+        flavors << node.text.strip
+      end
+    end
 
-      raise "Parsing #{spec_file} failed:\n#{stderr}" unless status.success?
+    puts "Found multibuild targets: #{flavors.join(", ")}" if verbose
+    flavors
+  end
+
+  # Read the build dependencies from all spec files. For multi build packages
+  # evaluate all package flavors.
+  # @return [Array<String>] list of build dependencies
+  def buildrequires
+    buildrequires = []
+    # OBS additionally runs a default build with empty flavor in multi build packages,
+    # for simplification use it also for single build packages
+    flavors = multibuild_flavors + [ "" ]
+    Dir.glob("#{Packaging::Configuration.instance.package_dir}/*.spec").each do |spec_file|
+      # replace the "@BUILD_FLAVOR@" placeholder by each flavor defined
+      flavors.each do |flavor|
+        spec_content = File.read(spec_file).gsub("@BUILD_FLAVOR@", flavor)
 
-      buildrequires.concat(stdout.split("\n"))
+        # get the BuildRequires from the spec files, this also expands the RPM macros like %{rubygem}
+        # use Open3 as the command produces some bogus error messages on stderr even on success,
+        # but in case of error it provides a hint what failed
+        stdout, stderr, status = Open3.capture3("rpmspec", "-q", "--buildrequires", "/dev/stdin", stdin_data: spec_content)
+        raise "Parsing #{spec_file} (flavor #{flavor.inspect})failed:\n#{stderr}" unless status.success?
+        buildrequires.concat(stdout.split("\n"))
+      end
     end
 
     # remove the duplicates and sort the packages for easier reading

data/lib/tasks/osc.rake

@@ -160,8 +160,12 @@ namespace :osc do
       Dir.chdir osc_checkout_dir do
         puts "building package..." if verbose
 
-        # pipe yes to osc build to automatic rebuild broken build root if it happen
-        command = "yes | osc -A '#{obs_api}' build"
+        # feed the "osc build" command with "y" input to automatically rebuild
+        # the broken build root if that happens, three attempts should be enough in most cases
+        # do not use the "yes" command here as the endless output might cause endless loop
+        # (workaround for a broken rpmlint/checkbashisms test,
+        # https://bugzilla.suse.com/show_bug.cgi?id=1190094)
+        command = "echo -e 'y\\ny\\ny\\n' | osc -A '#{obs_api}' build"
         command << " --no-verify" #ignore untrusted BS projects
         command << " --release=1" #have always same release number
         # store packages for given base system at one place, so it speeds up rebuild

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.3
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -49,7 +49,7 @@ files:
 - lib/tasks/tarball.rake
 homepage: https://github.com/openSUSE/packaging_rake_tasks
 licenses:
-- LGPL v2.1
+- LGPL-2.1
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with