packaging_rake_tasks 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d2716778ca9f5bae89a0ff9a024ed8287c1892907b1a9bd6b57da3e35be4b6
-  data.tar.gz: 5c53d47b4e44df0f737f6de4650bed1780f3f4c197514e8ac6dc3bbdcb140080
+  metadata.gz: b51c3cd7c0620ced6018b4efe708293083eec2426b21aa1eac2475f3a6375ecd
+  data.tar.gz: fbf59488ffb0527701ab74c2ef0e9774d7eccac73de402c846abf4fc8b4c8057
 SHA512:
-  metadata.gz: de603feead7958f7ac02a6263a7fe6b8aa36691d948c995398b7327d9f3ed9c753f564409e4e2aaa18df590856f5181e14cb20e07be4468a1763dd4b6a8e74c7
-  data.tar.gz: 167c400d98bd31136c73dbaf88e62308878e155ca9d43f63a7e8fb6ecbcdec2867e8719a1f05b4cec501b9dfab7ce5af7b6c13f34aeb3bd6837e09545e95143c
+  metadata.gz: ff56da780a5b28abc3e2722f414f7f9141f7c9a29d7c73eb631c3113d8c1301a8463c1be80a52f11d7e07ae8535e1a289a514473ff6ac894d66f2cb8968d8bab
+  data.tar.gz: 13215646f023675f0157fce2e8cec42c97cd1d3c56c00773f824b17d5ff2a2321926323a4d481ec48ceaca893a50d6dc0e04c7152e637b10ac4e39f9dd43f2bc

data/VERSION

@@ -1 +1 @@
-1.5.1
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 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: []