[rpms/rbm] rawhide: Rebase to a git snapshot taken on 2026-06-22

[rpms/rbm] rawhide: Rebase to a git snapshot taken on 2026-06-22

[@ 2026-06-22 9:10 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/rbm
Branch : rawhide
Commit : c62bb36cb918da5986346aeaef5370a5605e259c
Author : Petr Písař <ppisar@redhat.com>
Date   : 2026-06-22T11:09:53+02:00
Stats  : +12/-149 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rbm/c/c62bb36cb918da5986346aeaef5370a5605e259c?branch=rawhide

Log:
Rebase to a git snapshot taken on 2026-06-22

---
diff --git a/.gitignore b/.gitignore
index 6b9606d..89dee7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /rbm-37c204c.tar.gz
 /rbm-10c6b24.tar.gz
 /rbm-c6a4095.tar.gz
+/rbm-865f2c98.tar.gz
+/rbm-865f2c9.tar.gz

diff --git a/rbm-c6a4095-Remove-on-line-tests.patch b/rbm-c6a4095-Remove-on-line-tests.patch
deleted file mode 100644
index 32460a7..0000000
--- a/rbm-c6a4095-Remove-on-line-tests.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 40ab75e661d88bbf8aef60c41fd5950aec611d48 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 26 Jun 2023 16:39:37 +0200
-Subject: [PATCH] Remove on-line tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These tests downloads files from the Internet and thus fail in an
-isolated environment.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- test.pl                                 | 39 +------------------------
- test/projects/mozmill-automation/config | 15 ----------
- test/projects/shasum/config             | 28 ------------------
- 3 files changed, 1 insertion(+), 81 deletions(-)
- delete mode 100644 test/projects/mozmill-automation/config
- delete mode 100644 test/projects/shasum/config
-
-diff --git a/test.pl b/test.pl
-index 31968f3..0bc4db2 100755
---- a/test.pl
-+++ b/test.pl
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- use strict;
- use Path::Tiny;
--use Test::More tests => 45;
-+use Test::More tests => 39;
- use lib 'lib/';
- 
- sub set_target {
-@@ -236,21 +236,6 @@ my @tests = (
-           'out/m3-output' => "1 - build\n___m3\n"
-         },
-     },
--    {
--        name => 'mercurial repo',
--        target => [],
--        config => [ 'mozmill-automation', 't' ],
--        expected => '432611daa42c7608d32b04c89ac26fbcea6a61663419aa88ead87116e212a004',
--    },
--    {
--        name => 'mercurial repo build',
--        target => [],
--        build => [ 'mozmill-automation', 'build' ],
--        files => {
--            'out/mozmill-automation-bbad7215c713_sha256sum.txt' =>
--            "ceeda3cd3285b6ed53233dc65e3beac82f2b284402a80ef6c1fcdf5b9861f068  s.txt\n",
--        },
--    },
-     {
-         name => 'build using files and directories as input',
-         target => [],
-@@ -260,28 +245,6 @@ my @tests = (
-             "1\n2\n3\n4\n1\n2\n",
-         },
-     },
--    {
--        name => 'sha256sum input_files',
--        target => [ 'sha256sum' ],
--        build  => [ 'shasum', 'build' ],
--        files  => {},
--    },
--    {
--        name => 'sha512sum input_files',
--        target => [ 'sha512sum' ],
--        build  => [ 'shasum', 'build' ],
--        files  => {},
--    },
--    {
--        name => 'wrong sha256sum input_files',
--        target => [ 'wrong_sha256sum' ],
--        fail_build  => [ 'shasum', 'build' ],
--    },
--    {
--        name => 'wrong sha512sum input_files',
--        target => [ 'wrong_sha512sum' ],
--        fail_build  => [ 'shasum', 'build' ],
--    },
- );
- 
- foreach my $test (@tests) {
-diff --git a/test/projects/mozmill-automation/config b/test/projects/mozmill-automation/config
-deleted file mode 100644
-index afe4c6a..0000000
---- a/test/projects/mozmill-automation/config
-+++ /dev/null
-@@ -1,15 +0,0 @@
--version: '[% c("abbrev") %]'
--hg_url: https://hg.mozilla.org/qa/mozmill-automation/
--hg_hash: bbad7215c713
--compress_tar: ''
--t: '[% sha256(exec("cat testrun_remote.py")) %]'
--build: |
--  #!/bin/sh
--  mkdir t
--  tar -C t -xf mozmill-automation-bbad7215c713.tar
--  files=$(find t | sort)
--  for file in $files
--  do
--    sha256sum $file >> s.txt
--  done
--  sha256sum s.txt > [% dest_dir %]/[% project %]-[% c("version") %]_sha256sum.txt
-diff --git a/test/projects/shasum/config b/test/projects/shasum/config
-deleted file mode 100644
-index 9270318..0000000
---- a/test/projects/shasum/config
-+++ /dev/null
-@@ -1,28 +0,0 @@
--# vim: filetype=yaml sw=2
--debug: 1
--filename: 'shasum_project-[% c("input_files_id") %]'
--build: |
--  #!/bin/sh
--  echo ok > [% dest_dir _ '/' _ c("filename") %]
--
--targets:
--  sha256sum:
--    input_files:
--      - filename: sha256sums-signed-build.txt
--        URL: https://archive.torproject.org/tor-package-archive/torbrowser/13.0.15/sha256sums-signed-build.txt
--        sha256sum: 380c611762cf02a89a5885e7182ce17fc653f6b910c00ce50295c03c488b13ac
--  sha512sum:
--    input_files:
--      - filename: sha256sums-signed-build.txt
--        URL: https://archive.torproject.org/tor-package-archive/torbrowser/13.0.15/sha256sums-signed-build.txt
--        sha512sum: 5a1a5199f2135dd75bfeddafc25a62ce473083d371b13f90582b5faf3a3e7c415c4b4990d4927d8a468dca88bc8376fb55143020e7dadcc69b316f6212a7f825
--  wrong_sha256sum:
--    input_files:
--      - filename: sha256sums-signed-build.txt
--        URL: https://archive.torproject.org/tor-package-archive/torbrowser/13.0.15/sha256sums-signed-build.txt
--        sha256sum: aaa
--  wrong_sha512sum:
--    input_files:
--      - filename: sha256sums-signed-build.txt
--        URL: https://archive.torproject.org/tor-package-archive/torbrowser/13.0.15/sha256sums-signed-build.txt
--        sha512sum: aaa
--- 
-2.47.1
-

diff --git a/rbm.spec b/rbm.spec
index 33a15f4..e225eeb 100644
--- a/rbm.spec
+++ b/rbm.spec
@@ -1,22 +1,22 @@
-%global commit0 c6a40950607fa73861f81185764dff2bab150010
+%global commit0 865f2c9842520958879665d5c9b820d9ed51761e
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:       rbm
-Version:    0.4^20241205git%{shortcommit0}
-Release:    5%{?dist}
+Version:    0.4^20260622git%{shortcommit0}
+Release:    1%{?dist}
 Summary:    Reproducible Build Manager
 License:    CC0-1.0
 # A bug tracker is at <https://gitlab.torproject.org/tpo/applications/rbm/>.
 URL:        https://rbm.torproject.org/
 # Latest 0.4 release is very old, use a git snapshot,
 # <https://github.com/boklm/rbm/issues/2>.
-# Upstream git repository is <https://git.torproject.org/builders/rbm.git>.
+# Upstream git repository is <https://gitlab.torproject.org/tpo/applications/rbm.git>.
 Source0:    %{name}-%{shortcommit0}.tar.gz
 # Install container script, proposed to an upstream,
 # <https://github.com/boklm/rbm/pull/8>.
 Patch0:     rbm-c485326-Install-container-script-as-rmbcontainer.patch
 # Remove tests which require the Internet, not suitable for an upstream.
-Patch1:     rbm-c6a4095-Remove-on-line-tests.patch
+Patch1:     rbm-865f2c9-Remove-on-line-tests.patch
 BuildArch:  noarch
 BuildRequires:  asciidoc
 BuildRequires:  coreutils
@@ -146,13 +146,16 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test
 %{perl_vendorlib}/RBM
 %{perl_vendorlib}/RBM.pm
 %{_mandir}/man1/rbm.*
-%{_mandir}/man1/rbm-{build,fetch,showconf,tar,usage}.*
+%{_mandir}/man1/rbm-{build,fetch,showconf,show_used_projects,tar,usage}.*
 %{_mandir}/man7/rbm_{cli,config,input_files,layout,modules,remote,steps,targets,templates,tutorial}.*
 
 %files tests
 %{_libexecdir}/%{name}
 
 %changelog
+* Mon Jun 22 2026 Petr Pisar <ppisar@redhat.com> - 0.4^20260622git865f2c9-1
+- Rebase to a git snapshot taken on 2026-06-22
+
 * Mon Jun 22 2026 Petr Pisar <ppisar@redhat.com> - 0.4^20241205gitc6a4095-5
 - lsb_release tool is now provided by lsb_release package (bug #2491000)
 

diff --git a/sources b/sources
index 4cc5a38..2b4d1d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rbm-c6a4095.tar.gz) = 2eca50003818965575c85d566dfef9f1059fa54e5af86feb60eae6f3b06d1df88f8971a4603a188545b3aacaa79bc83fe732b6f92bd48013a7c9165819f231ed
+SHA512 (rbm-865f2c9.tar.gz) = 3fb01928685f92db0e685ff4037a88e4beef0423fafe0eb0c219ae50b398e4f6fd9cae8f4335ee0c1353040181706ccbc19a530c991c1832635dc43bac70028b