public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Domonkos <mdomonko@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/rpm] rawhide: Rebase to 6.1 rc2 (https://fedoraproject.org/wiki/Changes/RPM-6.1)
Date: Tue, 21 Jul 2026 07:57:48 GMT [thread overview]
Message-ID: <178462066871.1.15600335351639474225.rpms-rpm-0b49e31cd222@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rpm
Branch : rawhide
Commit : 0b49e31cd222be49993a93f78e31a6fb43bb24f6
Author : Michal Domonkos <mdomonko@redhat.com>
Date : 2026-07-20T15:42:55+02:00
Stats : +7/-11 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/rpm/c/0b49e31cd222be49993a93f78e31a6fb43bb24f6?branch=rawhide
Log:
Rebase to 6.1 rc2 (https://fedoraproject.org/wiki/Changes/RPM-6.1)
---
diff --git a/.gitignore b/.gitignore
index ea515da..aa9bbc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@
/rpm-6.0.0.tar.bz2
/rpm-6.0.1.tar.bz2
/rpm-6.0.91.tar.bz2
+/rpm-6.0.92.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index dcabdcf..344d533 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,9 +26,9 @@
%define rpmhome /usr/lib/rpm
-%global rpmver 6.0.91
+%global rpmver 6.0.92
#global snapver rc1
-%global baserelease 4
+%global baserelease 1
%global sover 10
%global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -125,15 +125,7 @@ rpm-6.0-rpmformat.patch
# https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/298
0001-Revert-Add-a-deprecation-warning-for-clamp_mtime_to_.patch
-# Temporarily revert file trigger refactor for further investigation
-0001-Revert-Eliminate-the-now-redundant-rpmtriggers-wrapp.patch
-0002-Revert-Convert-file-trigger-structures-minimally-to-.patch
-
# Patches already upstream:
-# Slightly modified from usptream commit due to not having the test,
-# because the test adds a binary that "patch" doesn't handle, argh
-0001-Fix-rubygem-extract-regression-from-b8b54f92c65bca7b.patch
-0001-Fix-a-dumb-regression-from-introducing-define-option.patch
# These are not yet upstream
rpm-4.7.1-geode-i686.patch
@@ -646,6 +638,9 @@ fi
%doc %{_defaultdocdir}/rpm/API/
%changelog
+* Mon Jul 20 2026 Michal Domonkos <mdomonko@redhat.com - 6.0.92-1
+- Rebase to 6.1 rc2 (https://fedoraproject.org/wiki/Changes/RPM-6.1)
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.91-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 700b8e4..eb918e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-6.0.91.tar.bz2) = 7f62fed6193aff95e95ba2db5bd00e5e6c6457e7f8f233a01251bebccc2492c8b9d0f74a4c11587e031e8d5624784c4d0728dd0005a64eff96e2aec72f5de15c
+SHA512 (rpm-6.0.92.tar.bz2) = 41a98a5bc90c86725c1e455db4d0fa6b553f8bfda89376a1a9b28ba3bcb2bc97e2d3fb14ec6123dde8a1289d29cb8e1d023ba14a0a095def361af637bbeb8c33
reply other threads:[~2026-07-21 7:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178462066871.1.15600335351639474225.rpms-rpm-0b49e31cd222@fedoraproject.org \
--to=mdomonko@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox