[rpms/rpm] rawhide: Rebase to 6.1 rc1 (https://fedoraproject.org/wiki/Changes/RPM-6.1)

[rpms/rpm] rawhide: Rebase to 6.1 rc1 (https://fedoraproject.org/wiki/Changes/RPM-6.1)

[Panu Matilainen]

A new commit has been pushed.

Repo   : rpms/rpm
Branch : rawhide
Commit : e6e834b53b1a803c8013c79bc8529d39229c7c4c
Author : Panu Matilainen <pmatilai@redhat.com>
Date   : 2026-06-22T16:46:40+03:00
Stats  : +30/-18 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rpm/c/e6e834b53b1a803c8013c79bc8529d39229c7c4c?branch=rawhide

Log:
Rebase to 6.1 rc1 (https://fedoraproject.org/wiki/Changes/RPM-6.1)

---
diff --git a/.gitignore b/.gitignore
index 179b7f8..ea515da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@
 /rpm-5.99.92.tar.bz2
 /rpm-6.0.0.tar.bz2
 /rpm-6.0.1.tar.bz2
+/rpm-6.0.91.tar.bz2

diff --git a/rpm-4.18.x-siteconfig.patch b/rpm-4.18.x-siteconfig.patch
deleted file mode 100644
index af6ebf0..0000000
--- a/rpm-4.18.x-siteconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up rpm-4.18.1/macros.in.orig rpm-4.18.1/macros.in
---- rpm-4.18.1/macros.in.orig	2023-03-15 13:52:55.211928040 +0100
-+++ rpm-4.18.1/macros.in	2023-03-15 13:55:04.113129930 +0100
-@@ -746,7 +746,9 @@ package or when debugging this package.\
-   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
-   export CLASSPATH}\
-   PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
--  export PKG_CONFIG_PATH
-+  export PKG_CONFIG_PATH\
-+  CONFIG_SITE=${CONFIG_SITE:-NONE}\
-+  export CONFIG_SITE
- 
- %___build_pre	\
-   %{___build_pre_env} \

diff --git a/rpm-6.1.x-siteconfig.patch b/rpm-6.1.x-siteconfig.patch
new file mode 100644
index 0000000..9169f38
--- /dev/null
+++ b/rpm-6.1.x-siteconfig.patch
@@ -0,0 +1,14 @@
+diff -up rpm-6.0.91/macros.in.siteconf rpm-6.0.91/macros.in
+--- rpm-6.0.91/macros.in.siteconf	2026-06-22 15:48:00.437505186 +0300
++++ rpm-6.0.91/macros.in	2026-06-22 15:48:22.102038036 +0300
+@@ -797,7 +797,9 @@ Supplements:   (%{name} = %{version}-%{r
+   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+   export CLASSPATH}\
+   PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
+-  export PKG_CONFIG_PATH
++  export PKG_CONFIG_PATH\
++  CONFIG_SITE=${CONFIG_SITE:-NONE}\
++  export CONFIG_SITE
+ 
+ %___build_pre	\
+   . %{builddir}/rpmbuild.env\

diff --git a/rpm.spec b/rpm.spec
index f03a089..42735cc 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,9 +26,9 @@
 
 %define rpmhome /usr/lib/rpm
 
-%global rpmver 6.0.1
+%global rpmver 6.0.91
 #global snapver rc1
-%global baserelease 6
+%global baserelease 1
 %global sover 10
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -111,7 +111,7 @@ BuildRequires: fsverity-utils-devel
 # Set rpmdb path to /usr/lib/sysimage/rpm
 rpm-4.17.x-rpm_dbpath.patch
 # Disable autoconf config.site processing (#962837)
-rpm-4.18.x-siteconfig.patch
+rpm-6.1.x-siteconfig.patch
 # In current Fedora, man-pages pkg owns all the localized man directories
 rpm-4.9.90-no-man-dirs.patch
 
@@ -466,6 +466,7 @@ fi
 %{_mandir}/man5/rpm-macrofile.5*
 %{_mandir}/man5/rpm-manifest.5*
 %{_mandir}/man5/rpm-rpmrc.5*
+%{_mandir}/man7/rpm-design.7*
 %{_mandir}/man7/rpm-lua.7*
 %{_mandir}/man7/rpm-macros.7*
 %{_mandir}/man7/rpm-payloadflags.7*
@@ -574,7 +575,10 @@ fi
 %{_bindir}/gendiff
 %{_bindir}/rpmspec
 %{_bindir}/rpmlua
+%{_bindir}/rpmuncompress
+%{_bindir}/rpm-setup-autosign
 
+%{_mandir}/man1/elfdeps.1*
 %{_mandir}/man1/gendiff.1*
 %{_mandir}/man1/rpmbuild.1*
 %{_mandir}/man1/rpmdeps.1*
@@ -583,6 +587,10 @@ fi
 %{_mandir}/man1/rpm-setup-autosign.1*
 %{_mandir}/man1/rpmuncompress.1*
 %{_mandir}/man5/rpmbuild-config.5.*
+%{_mandir}/man7/rpm-dependency-generators.7*
+%{_mandir}/man7/rpm-scriptlets.7*
+%{_mandir}/man7/rpm-sysusers.7*
+
 
 %{rpmhome}/brp-*
 %{rpmhome}/check-*
@@ -630,6 +638,9 @@ fi
 %doc %{_defaultdocdir}/rpm/API/
 
 %changelog
+* Mon Jun 22 2026 Panu Matilainen <pmatilai@redhat.com - 6.0.91-1
+- Rebase to 6.1 rc1 (https://fedoraproject.org/wiki/Changes/RPM-6.1)
+
 * Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 6.0.1-6
 - Rebuilt for Python 3.15
 

diff --git a/sources b/sources
index 1c25ccc..700b8e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-6.0.1.tar.bz2) = 55a03b6c65c6bd009ce824feb6298d305eb497464d860aa92ccdf15bcea9af0e2dd70e9ac4b26a8494a222656201314dc1c7a245d9cb5416b058f66f8276f4e9
+SHA512 (rpm-6.0.91.tar.bz2) = 7f62fed6193aff95e95ba2db5bd00e5e6c6457e7f8f233a01251bebccc2492c8b9d0f74a4c11587e031e8d5624784c4d0728dd0005a64eff96e2aec72f5de15c