[packages/rpm] - up to 6.0.91 / 6.1.0 RC1
baggins
baggins at pld-linux.org
Tue May 19 22:43:39 CEST 2026
commit fc3ace888905a4840a6bb952520edb33a5580295
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed May 20 00:43:06 2026 +0200
- up to 6.0.91 / 6.1.0 RC1
cpuinfo-deps.patch | 8 ++++----
missing-macros.patch | 4 ++--
multicolor-fixes.patch | 4 ++--
rpm-scripts-closefds.patch | 4 ++--
rpm.spec | 23 +++++++++++++++--------
uname-deps.patch | 8 ++++----
6 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 1ad4280..af10ff4 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,7 +18,7 @@
%define popt_ver 1.15
%define rpm_sequoia_ver 1.9.0
-%if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5"
+%if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5" || "%{_rpmversion}" >= "6"
%define with_recommends_tags 1
%endif
@@ -35,13 +35,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM
Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
-Version: 6.0.1
-Release: 7
+Version: 6.0.91
+Release: 0.1
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
-Source0: http://ftp.rpm.org/releases/rpm-6.0.x/%{name}-%{version}.tar.bz2
-# Source0-md5: b71495ca9f3a611a1d5d9bf48c048fab
+Source0: http://ftp.rpm.org/releases/testing/%{name}-%{version}.tar.bz2
+# Source0-md5: eb3a6181a82ec1e53791b36dad5f4ad6
Source1: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
# Source1-md5: 23914bb49fafe7153cee87126d966461
Source100: https://github.com/rpm-software-management/rpmpgp_legacy/archive/1.1/rpmpgp_legacy-1.1.tar.gz
@@ -909,8 +909,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%{_mandir}/man5/rpm-macrofile.5*
%{_mandir}/man5/rpm-manifest.5*
%{_mandir}/man5/rpm-rpmrc.5*
+%{_mandir}/man7/rpm-design.7*
%{_mandir}/man7/rpm-macros.7*
%{_mandir}/man7/rpm-queryformat.7*
+%{_mandir}/man7/rpm-sysusers.7*
%{_mandir}/man7/rpm-version.7*
%{_mandir}/man8/rpm.8*
%{_mandir}/man8/rpm-common.8*
@@ -1008,7 +1010,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%attr(755,root,root) %{_bindir}/rpm2archive
%attr(755,root,root) %{_bindir}/rpm2cpio
%attr(755,root,root) %{_bindir}/rpmgraph
-%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
+%{_rpmlibdir}/rpm2cpio.sh
%attr(755,root,root) %{_rpmlibdir}/tgpg
%attr(755,root,root) %{_rpmlibdir}/rpmdeps
%{_mandir}/man1/rpm2archive.1*
@@ -1019,6 +1021,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%files build
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/noauto*
+%attr(755,root,root) %{_bindir}/rpm-setup-autosign
+%attr(755,root,root) %{_bindir}/rpmuncompress
%attr(755,root,root) %{_rpmlibdir}/brp-*
%attr(755,root,root) %{_rpmlibdir}/check-buildroot
%attr(755,root,root) %{_rpmlibdir}/check-files
@@ -1034,8 +1038,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%attr(755,root,root) %{_rpmlibdir}/ocamldeps.sh
%attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
%attr(755,root,root) %{_rpmlibdir}/rpm_macros_provides.sh
-%attr(755,root,root) %{_rpmlibdir}/rpm-setup-autosign
-%attr(755,root,root) %{_rpmlibdir}/rpmuncompress
+%{_rpmlibdir}/rpm-setup-autosign
+%{_rpmlibdir}/rpmuncompress
%attr(755,root,root) %{_rpmlibdir}/script.req
%dir %{_rpmlibdir}/fileattrs
@@ -1058,6 +1062,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%attr(755,root,root) %{_bindir}/rpmlua
%attr(755,root,root) %{_bindir}/rpmspec
+%{_mandir}/man1/elfdeps.1*
%{_mandir}/man1/gendiff.1*
%{_mandir}/man1/rpmbuild.1*
%{_mandir}/man1/rpmlua.1*
@@ -1065,8 +1070,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%{_mandir}/man1/rpmspec.1*
%{_mandir}/man1/rpmuncompress.1*
%{_mandir}/man5/rpmbuild-config.5*
+%{_mandir}/man7/rpm-dependency-generators.7*
%{_mandir}/man7/rpm-lua.7*
%{_mandir}/man7/rpm-payloadflags.7*
+%{_mandir}/man7/rpm-scriptlets.7*
%if %{with python3}
%files -n python3-rpm
diff --git a/cpuinfo-deps.patch b/cpuinfo-deps.patch
index d3c6b6b..df7be27 100644
--- a/cpuinfo-deps.patch
+++ b/cpuinfo-deps.patch
@@ -15,16 +15,16 @@ diff -ur rpm-4.16.0/lib/depends.cc rpm-4.16.0-cpuinfo/lib/depends.cc
+ }
+ }
+
- /* Dont look at pre-requisites of already installed packages */
- if (!adding && isTransientReq(dsflags))
+ /* See if the runtime system provides it, similar to rpmlib provides */
+ if (systemProvides(ts, dep) == 0)
goto exit;
diff -ur rpm-4.16.0/lib/rpmds.cc rpm-4.16.0-cpuinfo/lib/rpmds.cc
--- rpm-4.16.0/lib/rpmds.cc 2020-11-08 20:19:15.625093667 +0100
+++ rpm-4.16.0-cpuinfo/lib/rpmds.cc 2020-11-08 20:16:25.941242497 +0100
@@ -2,6 +2,8 @@
- */
- #include "system.h"
#include <atomic>
+ #include <string>
+ #include <vector>
+#include <popt.h>
+#include <ctype.h>
#include <sys/utsname.h>
diff --git a/missing-macros.patch b/missing-macros.patch
index c3975ed..d643f32 100644
--- a/missing-macros.patch
+++ b/missing-macros.patch
@@ -7,7 +7,7 @@
+ findutil(__BASH bash)
findutil(__BZIP2 bzip2)
findutil(__CAT cat)
- findutil(__CHMOD chmod)
+ findutil(__CAR car)
@@ -132,6 +133,7 @@
findutil(__PATCH patch)
findutil(__RM rm)
@@ -32,8 +32,8 @@
%__awk @__AWK@
+%__bash @__BASH@
%__bzip2 @__BZIP2@
+ %__car @__CAR@
%__cat @__CAT@
- %__chmod @__CHMOD@
@@ -54,6 +57,7 @@
%__patch @__PATCH@
%__rm @__RM@
diff --git a/multicolor-fixes.patch b/multicolor-fixes.patch
index fabb9e8..684fbd9 100644
--- a/multicolor-fixes.patch
+++ b/multicolor-fixes.patch
@@ -176,8 +176,8 @@ index 691fc6393..899c5c3f4 100644
--- a/tests/rpmi.at
+++ b/tests/rpmi.at
@@ -2083,3 +2083,95 @@ runroot rpm -U --nodb --test --ignorearch --ignoreos --nodeps --nosignature \
- [ installing package hello-2.0-1.x86_64 needs 36KB more space on the / filesystem
- ])
+ ],
+ [])
RPMTEST_CLEANUP
+
+# ------------------------------
diff --git a/rpm-scripts-closefds.patch b/rpm-scripts-closefds.patch
index 3a8d539..35b86b7 100644
--- a/rpm-scripts-closefds.patch
+++ b/rpm-scripts-closefds.patch
@@ -1,8 +1,8 @@
--- rpm-4.16.0/lib/rpminstall.cc.orig 2020-05-28 12:04:25.040136702 +0200
+++ rpm-4.16.0/lib/rpminstall.cc 2020-10-03 09:46:49.369707250 +0200
@@ -4,6 +4,7 @@
-
- #include "system.h"
+ #include <string>
+ #include <vector>
+#include <fcntl.h>
#include <string.h>
diff --git a/uname-deps.patch b/uname-deps.patch
index 9d3334f..0174b5a 100644
--- a/uname-deps.patch
+++ b/uname-deps.patch
@@ -24,17 +24,17 @@ index 28a4a784d..1d8ce1f8a 100644
+ }
+ }
+
- /* Dont look at pre-requisites of already installed packages */
- if (!adding && isTransientReq(dsflags))
+ /* See if the runtime system provides it, similar to rpmlib provides */
+ if (systemProvides(ts, dep) == 0)
goto exit;
diff --git a/lib/rpmds.cc b/lib/rpmds.cc
index f7ee76392..754969e39 100644
--- a/lib/rpmds.cc
+++ b/lib/rpmds.cc
@@ -2,6 +2,7 @@
- */
- #include "system.h"
#include <atomic>
+ #include <string>
+ #include <vector>
+#include <sys/utsname.h>
#include <rpm/rpmtypes.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/fc3ace888905a4840a6bb952520edb33a5580295
More information about the pld-cvs-commit
mailing list