packaging_rake_tasks 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51c3cd7c0620ced6018b4efe708293083eec2426b21aa1eac2475f3a6375ecd
-  data.tar.gz: fbf59488ffb0527701ab74c2ef0e9774d7eccac73de402c846abf4fc8b4c8057
+  metadata.gz: a92258f52b7bcddc572736022561d288af42c9ae444c9fee77e1e079a0be6bd1
+  data.tar.gz: 7439a1b53ae472c235875108c511f9f13d005bcf1ab25cf9509356651e5ad64a
 SHA512:
-  metadata.gz: ff56da780a5b28abc3e2722f414f7f9141f7c9a29d7c73eb631c3113d8c1301a8463c1be80a52f11d7e07ae8535e1a289a514473ff6ac894d66f2cb8968d8bab
-  data.tar.gz: 13215646f023675f0157fce2e8cec42c97cd1d3c56c00773f824b17d5ff2a2321926323a4d481ec48ceaca893a50d6dc0e04c7152e637b10ac4e39f9dd43f2bc
+  metadata.gz: d99843ac07be5625e4bf5104c8e068fa2a450f0525eae3b9acaddac27b6e29e6f2a750130577642bbf352643c53016e4b0fcc11acb039769a6043f63b3507fdf
+  data.tar.gz: bfda90bfce230b73b517a9c8f6313d579c8d797461df971837bffd96559b12e6a10e55e2d8453d9c210c626dcab5850ef2979adb5c38a38a42cdca56e753d17b

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/lib/tasks/build_dependencies.rake

@@ -18,6 +18,7 @@
 
 require "shellwords"
 require "open3"
+require "tempfile"
 
 namespace :build_dependencies do
   # Read the multi build targets from the "_multibuild" file.
@@ -36,10 +37,17 @@ namespace :build_dependencies do
       end
     end
 
-    puts "Found multibuild targets: #{flavors.join(", ")}" if verbose
+    puts "Found multibuild targets: #{flavors.join(", ")}" if verbose && !flavors.empty?
     flavors
   end
 
+  # 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
@@ -51,14 +59,19 @@ namespace :build_dependencies do
     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)
+        spec_content = File.read(spec_file).gsub!("@BUILD_FLAVOR@", flavor)
 
-        # 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"))
+        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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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