qrpm 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e586c518e0a92575d817d0bc83c3a3d5de1355249952535ad0ab9cb3e0c980c
-  data.tar.gz: 7216415b387f365a3b8979904a8302de92d0b5d18ef5d2c05e1813ce4dbacba2
+  metadata.gz: 747c9881ee1882523155861b2f7c5ac9d10a5458051978191d9d83935002abcf
+  data.tar.gz: 19fdcbac9b24a81f9bd1ed5d508cdf6c9d0997a04b5e36607a98e85eebc38dcb
 SHA512:
-  metadata.gz: cffc3d4360cabdc426ee1fc2a0e74c75faf58f04f2f9eb888738d7505550c87d7ccc37832b1e8b312b13b5fa3c8e14c65253434b7a65468335646e6c3546d3db
-  data.tar.gz: 111553786fc1513e752816314745bac348d7d2a0c638d71facc00c5edf39ee2ca5db36951730b7998f1afdbf001a76bdfbfd86fd33fdf3b44955b612d65191fd
+  metadata.gz: af6edf0f5218d4f1e19cd9f0d09cbfcb478643b80c40c7030b6616d104f3b670cc7828d504175259f2f932bf41c6adaa542382450e82c6b9b48bd9bb337da590
+  data.tar.gz: 06024f494107a593549a147fd0f26c837ad1444aa34008e4b71a57e52452504b8e41b30dad83ef700ef10e40afdb6eae48c437ff9cb640a0da8a017d93a97402

data/exe/qrpm

@@ -236,6 +236,13 @@ begin
       -B,force-builddir=PATH?
         Like --builddir but overwrites the directory if it exists beforehand
 
+      --target=TARGET
+        Build the package for another system. The target selects rpm macros
+        that make the package installable there and is appended to the
+        release, eg. 1.el7, so that the package file shows what it was built
+        for. The only target is 'el7' (CentOS/RHEL 7), which makes rpmbuild use
+        a gzip payload because rpm 4.11 can't read the default zstd payload
+
       -d,dump
         Dump internal data and exit. For debug
 
@@ -314,7 +321,11 @@ begin
   # relative to the source directory
   compiler = Qrpm::Compiler.new(overrides)
   qrpm = compiler.compile(conf)
-  rpm = qrpm.rpm
+  # Check target
+  opts.target.nil? || Qrpm::Rpm::TARGETS.key?(opts.target) or
+      ShellOpts.error "Unknown target '#{opts.target}', use one of #{Qrpm::Rpm::TARGETS.keys.join(", ")}"
+
+  rpm = qrpm.rpm(target: opts.target)
 
   if opts.subcommand == :show!
     for variable in show

data/lib/qrpm/rpm.rb

@@ -50,6 +50,15 @@ module Qrpm
 
     RPM_DIRS = %w(SOURCES BUILD RPMS SPECS SRPMS tmp)
 
+    # Build targets. Maps from target name to the rpm macros that make the
+    # package installable on that system. The target is also appended to the
+    # release so that the package file shows what it was built for
+    TARGETS = {
+      # rpm 4.11 on el7 can't read the zstd payload that newer rpmbuild
+      # versions emit by default
+      "el7" => { "_binary_payload" => "w9.gzdio" }
+    }
+
     # Field accessor methods. FIXME Value should have been resolved
     FIELDS.each { |f,ts|
       if ts.include? Array
@@ -81,19 +90,28 @@ module Qrpm
     # The content of the SPEC file
     attr_reader :spec
 
+    # Build target, a key of TARGETS, or nil
+    attr_reader :target
+
+    # The rpm macros of the target as a hash. Empty if there is no target
+    def globals() target ? TARGETS[target] : {} end
+
     def files() @files ||= nodes.select(&:file?) end
     def dirs() @dirs ||= nodes.select(&:dir?) end
     def links() @links ||= nodes.select(&:link?) end
     def reflinks() @reflinks ||= nodes.select(&:reflink?) end
     def symlinks() @symlinks ||= nodes.select(&:symlink?) end
 
-    def initialize(srcdir, fields, nodes, template: QRPM_ERB_FILE)
+    def initialize(srcdir, fields, nodes, template: QRPM_ERB_FILE, target: nil)
       constrain srcdir, String
       constrain fields, { String => Node }
       constrain nodes, [FileNode]
+      constrain target, String, nil
+      target.nil? || TARGETS.key?(target) or raise ArgumentError, "Unknown target '#{target}'"
       @fields, @nodes = fields, nodes
       @srcdir = srcdir
       @template = template
+      @target = target
     end
 
     def has_configure?() ::File.exist? "#{srcdir}/configure" end
@@ -172,6 +190,7 @@ module Qrpm
     def dump
       puts self.class
       indent {
+        puts "target: #{target}" if target
         puts "fields"
         indent { fields.sort_by(&:first).each { |k,v| puts "#{k}: #{v.value}" } }
         puts "nodes"

data/lib/qrpm/template.erb

@@ -1,7 +1,10 @@
+<% for macro, value in globals -%>
+%global <%= macro %> <%= value %>
+<% end -%>
 Name: <%= name %>
 Summary: <%= summary %>
 Version: <%= version %>
-Release: <%= release %>
+Release: <%= release %><%= target ? ".#{target}" : "" %>
 License: <%= license %>
 Packager: <%= packager %>
 <% for pck in require || [] -%>

data/lib/qrpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qrpm
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Claus Rasmussen