packaging_rake_tasks 1.5.1 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d2716778ca9f5bae89a0ff9a024ed8287c1892907b1a9bd6b57da3e35be4b6
-  data.tar.gz: 5c53d47b4e44df0f737f6de4650bed1780f3f4c197514e8ac6dc3bbdcb140080
+  metadata.gz: a92258f52b7bcddc572736022561d288af42c9ae444c9fee77e1e079a0be6bd1
+  data.tar.gz: 7439a1b53ae472c235875108c511f9f13d005bcf1ab25cf9509356651e5ad64a
 SHA512:
-  metadata.gz: de603feead7958f7ac02a6263a7fe6b8aa36691d948c995398b7327d9f3ed9c753f564409e4e2aaa18df590856f5181e14cb20e07be4468a1763dd4b6a8e74c7
-  data.tar.gz: 167c400d98bd31136c73dbaf88e62308878e155ca9d43f63a7e8fb6ecbcdec2867e8719a1f05b4cec501b9dfab7ce5af7b6c13f34aeb3bd6837e09545e95143c
+  metadata.gz: d99843ac07be5625e4bf5104c8e068fa2a450f0525eae3b9acaddac27b6e29e6f2a750130577642bbf352643c53016e4b0fcc11acb039769a6043f63b3507fdf
+  data.tar.gz: bfda90bfce230b73b517a9c8f6313d579c8d797461df971837bffd96559b12e6a10e55e2d8453d9c210c626dcab5850ef2979adb5c38a38a42cdca56e753d17b

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.4

data/lib/tasks/build_dependencies.rake

@@ -18,21 +18,61 @@
 
 require "shellwords"
 require "open3"
+require "tempfile"
 
 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
+
+    puts "Found multibuild targets: #{flavors.join(", ")}" if verbose && !flavors.empty?
+    flavors
+  end
 
-      raise "Parsing #{spec_file} failed:\n#{stderr}" unless status.success?
+  # Read the build dependencies from a file
+  def buildrequires_from_file(file)
+    stdout = `rpmspec -q --buildrequires #{file.shellescape}`
+    raise "Parsing #{file} failed" unless $?.success?
+    stdout.split("\n")
+  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"))
+        if spec_content.nil?
+          # no replacement, use the file directly
+          buildrequires.concat(buildrequires_from_file(spec_file))
+        else
+          # rpmspec can only read a file, write the processed data to a temporary file
+          Tempfile.create(["rake_build_deps-", ".spec"]) do |tmp|
+            tmp.write(spec_content)
+            tmp.flush
+            buildrequires.concat(buildrequires_from_file(tmp.path))
+          end
+        end
+      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.4
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2023-06-20 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: []
@@ -66,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with