qrpm 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85d9882ee64a9c241212a8c7d83b0cb8c326ee64c1dcb53bf0950c216d41c868
-  data.tar.gz: 877340a9c37016f4e8c5750dab7600250ed1a0a677d83e914104c0358e97587e
+  metadata.gz: 46adf6022a282921ffec7babe5d51a630265fdc006fe6a8f2108b05175d3801f
+  data.tar.gz: 152bedc386c3b1f80d4727c89bb2eda22aea5f98dec9d4bc505eb7484419e93c
 SHA512:
-  metadata.gz: fa2a874c63f91d7d00df124413ddc2c85495031e6f73c577b3892ca4ec18f4794a548aed99a41fca307c3f5f79b200166d52fb1e2439d29304720a890494ed9d
-  data.tar.gz: 677aceb85dcfc033f83df21a3bc1b8b501747855f3d42dfbf75b5c6dfea7bfc5eb9e26592a4261e751d1b461d75d23e1c1b7c5f547da0b86d38423f5e8ae8c49
+  metadata.gz: 5c97e24da7f3bde2793c624300c93ccd8197cae6f8c204e708663a2549c9c718cbd64f1a741c8a576c0aac65af8bcf9272eb633dafe3ca7def268a92a5bae73a
+  data.tar.gz: aab20b330f1968edeac8e4eeb96ba2a1953cb688f74b8274804d7e9c1b8b53ab023552338b438d13ebcdae32f2cf52837d4a9527284349440d55b7c677450601

data/exe/qrpm

@@ -55,6 +55,49 @@ begin
 
     BUILT-IN VARIABLES
 
+    There are the following built-in variables. They are listed below with their 
+    default values:
+
+      rootdir         /
+      rootconfdir     /etc
+      rootexecdir     /usr
+      rootlibdir      /usr
+      rootconstdir    /usr/share
+      rootdocdir      /usr/share
+      rootdatadir     /var
+
+      sysetcdir       /etc
+      sysbindir       /usr/bin
+      syssbindir      /usr/sbin
+      syslibdir       /usr/lib64
+      syslibexecdir   /usr/libexec
+      syssharedir     /usr/share
+      sysdocdir       /usr/share/doc
+      sysvardir       /var/lib
+      sysspooldir     /var/spool
+      sysrundir       /var/run
+      syslockdir      /var/lock
+      syscachedir     /var/cache
+      syslogdir       /var/log
+      systmpdir       /tmp
+
+      pcketcdir       /etc/NAME
+      pckbindir       /usr/bin
+      pcksbindir      /usr/sbin
+      pcklibdir       /usr/lib64/NAME
+      pcklibexecdir   /usr/libexec/NAME
+      pcksharedir     /usr/share/NAME
+      pckdocdir       /usr/share/doc/NAME
+      pckvardir       /var/NAME
+      pckspooldir     /var/spool/NAME
+      pckrundir       /var/run/NAME
+      pcklockdir      /var/lock/NAME
+      pckcachedir     /var/cache/NAME
+      pcklogdir       /var/log/NAME
+      pcktmpdir       /tmp/NAME
+
+    Note that there are no package specific directories for bin and sbin
+
     INSTALLATION DIRECTORIES
 
     OPTIONS
@@ -126,8 +169,12 @@ begin
   currdir = overrides["currdir"] = File.expand_path(overrides["currdir"] || Dir.getwd)
   qrpmdir = overrides["qrpmdir"] = File.expand_path(overrides["qrpmdir"] || opts.directory || ".")
 
+  # Check builddir (todo: also currdir?)
+  File.directory?(currdir) or error "Can't find '#{currdir}'"
+  File.directory?(qrpmdir) or error "Can't find '#{qrpmdir}'"
+
   # Compute builddir
-  if opts.builddir? && opts.force_builddir? 
+  if opts.builddir? && opts.force_builddir?
     ShellOpts.error "Can't use both --builddir and --force-builddir"
   elsif opts.builddir? || opts.force_builddir? 
     builddir = opts.builddir || opts.force_builddir || "builddir"
@@ -139,7 +186,7 @@ begin
   end
 
   # Check if repository is clean
-  opts.force? || opts.dump? || `git status --porcelain | grep -v '??' 2>/dev/null` == "" or 
+  opts.force? || opts.dump? || `cd #{qrpmdir}; git status --porcelain | grep -v '??' 2>/dev/null` == "" or 
       ShellOpts.error "Repository is dirty"
 
   # Check configuration file
@@ -156,8 +203,8 @@ begin
   Dir.chdir(qrpmdir)
 
   # Parse QRPM configuration file. Include paths are still resolved with the
-  # context of the original directory while filesystem paths are relative to
-  # the source directory
+  # context of the original directory if -C is used while filesystem paths are
+  # relative to the source directory
   compiler = Qrpm::Compiler.new(overrides)
   qrpm = compiler.compile(conf)
   rpm = qrpm.rpm

data/lib/qrpm/version.rb

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

data/lib/qrpm.rb

@@ -68,8 +68,8 @@ module Qrpm
     syssbindir: "$rootexecdir/sbin",
     syslibdir: "$rootlibdir/lib64",
     syslibexecdir: "$rootexecdir/libexec",
-    syssharedir: "$rootconstdir/$pckdir", # Always a subdir of /usr/share
-    sysdocdir: "$syssharedir",
+    syssharedir: "$rootconstdir",
+    sysdocdir: "$syssharedir/doc",
     sysvardir: "$rootdatadir/lib",
     sysspooldir: "$rootdatadir/spool",
     sysrundir: "$rootdatadir/run",
@@ -79,11 +79,10 @@ module Qrpm
     systmpdir: "/tmp" # Always /tmp because of security
   }
 
-  # There are no package-specific versions of bindir and sbindir
   PACKAGE_DIRS = {
     pcketcdir: "$sysetcdir/$pckdir",
-    pckbindir: "$sysbindir", # No subdir
-    pcksbindir: "$syssbindir", # No subdir
+    pckbindir: "$sysbindir", # No package-specific directory
+    pcksbindir: "$syssbindir", # No package-specific directory
     pcklibdir: "$syslibdir/$pckdir",
     pcklibexecdir: "$syslibexecdir/$pckdir",
     pcksharedir: "$syssharedir/$pckdir",
@@ -102,7 +101,7 @@ module Qrpm
   DEFAULTS = {
     "name" => "$(basename $PWD)",
     "summary" => "The $name RPM package",
-    "version" => "$(cd ${{srcdir}} && git tag -l 2>/dev/null | tail -1 | tr -dc '.0-9' || echo 0.0.0)",
+    "version" => "$(cd ${{srcdir}} && git tag -l 2>/dev/null | sort -V | tail -1 | tr -dc '.0-9' || echo 0.0.0)",
     "description" => "$summary",
     "release" => "1",
     "license" => "GPL",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qrpm
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2024-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts